If going with SES you will more than likely be pleased.
While the engine is out, I would change the fuel filters, oil filter, clean the fuel tank, clean inside the hull, replace any old lines, change the pump oil and wear ring, and generally anything that needs repairing/replacing.
Good luck.
edit: Bench test the oil pump and when you receive the engine replace the oil injector lines with new 3/32" tygon tube. Would also be a good idea to have the injectors cleaned.
Again - good luck.