If you feel you must change the boiler I would go for a heat-only. You already have an external expansion vessel, and with pump and boiler separate it's easier to diagnose and fix any problems.
Sometimes external pump can be problematic in that it may need wired directly to the boiler and that may itself be a difficult task.
Frankly do not see there will be much difference between system and heat only boilers