sounds like a good start. only other tip I have is to get an engine brush kit for like 30 bucks, clean and reclean every passage way, even if it has been dipped and flushed. and check and re-check cam bearings to make sure the holes are lined up enough.
