If you are definately wanting to change the boiler then i would be looking at a viessman,the do a direct replacement storage boiler twice the quality of the powermax and a whole lot easier to maintain,your other option is the worcester highflow ,not a fan of worcester myselfe but quite relable...