Following the plan you have is good. Its worth the $15 to throw oil in a few times to make sure you get all the water out of the motor... It likes to hide in the cam valley as well as other places.