Hi Dave, I met you on the beach when you were picking that beast up.
That mast is not the stock G21 mast as you know. It's my understanding that it is a mast from N6.0. The stock mast for that boat was 34'. So you should be able to tune it like a N6.0.
What I can't remember is if it had a boom or not. If it's boomless you might want to move the main sheet foward on the clew plate (if you can) resulting in a tighter foot. That might help the problem. Your gonna want to have the abilty to control rotation so you need to find the solution to the lines fouling.
Mike