I'd say you're on the right track. Though like CODE4 said, I would look into getting your waterpump elsewhere.Also, don't forget anaerobic sealant for the bedplate/block connection, oil pump, and the cam caps. Forget this and you will be very sorry.This link has a lot of helpful information that sometimes can easily be looked over. Good luck man, and keep us posted on your progress!http://www.2gnt.com/index.php?d=A_Proper_Rebuild
I contributed to the Wiki.