Hi and welcome from Scotland.
I understand your desire to do a 'proper' restoration but sticking with the full pressure motor appeals to me too.
The guys here may quell some of your concerns,should you decide to go back to the old motor.
Good luck,whatever route you take.
Jock.
P.S. Any pics?