Upgrade existing to condensing system boiler and upgrade cylinder to unvented. You will need to check incoming mains pressure and flow rate before doing this. Unvented cylinder will still have immersion back up.
If you are after saving space then fit a decent combi but again check existing...