Intermittent Hot Water?

Hot water is luke warm and fluctuates in temperature. On boiler controls temp goes from 70 to 80 and then drops with only amber and green lights on. British Gas said first of all it was the heat exchanger then changed their minds and say we need a non-return valve fitted in between the boiler and the shower. Does this sound correct?