In my opinion (and there are lots of others) I'd have a nice new combi fitted, bearing in mind an average combi will supply one hot outlet at a time, comfortably. Plus you'd need to check your cold mains flow/pressure first.
You could also have a direct replacement for your current boiler...