Look up Joe Bennett on you tube. Lots of very good videos to learn from Joyridertv
I've used Murrays in California, has lots of quality parts and customer support is great with answering questions. Mast step links for H16 are available and work great for stepping mast simply. All rigging is also available from them. Check the lengths of your forestay and shroud lines. The new rigging may differ from older lengths. My shrouds were the same length, but forestay was approx. 1 and half inches shorter.
Battens always hit mast. Push them over by pushing on batten ends.
Your boom may be lower because the mast is raked too far back. Make sure jib haylard tensions rigging fully. The forestay will become very loose in the process. This is normal and why some will use a second 10 hole adjuster at the bridles and bungee it tight to keep it from hitting the jib. See joyridertv again for instructional videos. Very helpfull
I am in the final stages of restoring an '85 H16 as well. Just sailed her for the first time and making adjustments.