i had the same problem with my combi. the only solution i have found is to make sure that the combi is set to comfort rather than economy and turn the dial for the central heating right down when you are filling the bath. bit inconvinient but at least the water is hot!
