I've seen a lot of hack jobs on rigging done by POs. I'd recommend that you first check the parts catalog to make sure you have all the right parts in all the right places. Then you can use the techniques discussed in this thread to see if you're in the ballpark on mast rake:
viewtopic.php?f=14&t=51949If so, and the only problem is that it's difficult to attach the forestay because there's barely enough slack, just add another 7 hole adjuster at the bridle as suggested by ronholm above. I ran my '85 that way for years.
Good luck!