I will, I am also planning on flushing the engine with "engine flush" just to be sure.

Should I be trying to start it before setting the gaps right on the bolts though? when starting it should I completely reassemble it with gaskets and all? or should I leave the gaskets off until everything is adjusted?