Hi Chris, and welcome to the place where you can ask all the questions you need to, to get the best junk rig on your boat.
Do I understand correctly that you are raking the mast forward by 4 degrees? If so, this is just what Annie Hill has done on Fantail, to keep the heel aft of the forward berth, and it's worked out well.
As Paul says, now you should be looking at all the stuff we've developed since PJR was written, and the consensus of opinion amongst junkies is that building some camber into the lower panels is the best way to go (though some who aren't looking for good windward ability stick with flat sails). It's not too hard, once you've got your head around thinking in 3D.