If u don't mind paying around £1500 (what I charge) for a new boiler then yes I'd recommend getting a new vaillant ecotec pro 28. You could go for an ecotec plus 28 or 32 kw but that would be extra expense. That new boiler shouldn't give you any issues as the boilers vaillant are making now are...