Another thought, if you go for a new boiler, I would not get a combi, after having a system boiler - stored water. You'll get a shock.
I remember the first I fitted, a Potterton, I got the Potterton guy out because the hot flow was so dismal. Thought there was something wrong. And the delay you...