Ok ,sounds like you have had enough of " Junior" !! 15 years ain't a bad age to have lasted ,given the fact that you have neglected it somewhat .
But changing the boiler isn't going to improve the taps performance.
Thanks Terry, as long as the water gets hot when I turn the tap on then I'll be happy. The flow rate (although you say its very poor) looks ok when the tap is actually running. If a new boiler make it hot and I get 4 litres a minute out of it, I'll be happy!