I would recommend you to lower the pressure (you may need a modern pressuretrol/vaporstat), and verify it with a good low-pressure gauge. I am sure that this would help to stop the water spitting from your heater.
I would have done the same, what “robertshawn” have mentioned in here. If that still don’t work, hire an expert to get all your heating problems solved.