Looks like a good/reasonable plan, Tim
Just to get the terminology correct in your list:
“Swap to a 6 cylinder that has an oil pump”
Presumably, you are referring to a high-pressure insert rod bearing 235/261 engine, as apposed to the older babbitted rod bearings 216/235 engines?
Both type of engines have an oil pump.
Good luck with proceeding with your plans.
I agree with Grigg on using a water pump relocation plate.
