sounds like your on the right track.

one last comment.never assume that the head shim that is on the engine is the actual head clerance. in many cases you will find that the engine actually has .006 to.oo8 without any head shim. Novarossi's are .008 without one and the factory installs an additional .010 giving the engine .018 stock. this has not always been the case but 99% of the time it is. when in doubt measure the head button register and the piston to the top of the liner at top dead center and subtract. this is the only way to really know.