Spinnaker Pole and Foreguy Setup

We now have pole in a bag on the boom and rerigged the foreguy to the bottom of the mast on deck. Now in heavy air the boom is starting to bounce around. It seems that the angle between the foreguy and the boom is to small for sufficient stabilization. Previously the foreguy was attached to a fitting near the hatch and provided much more stabilization. I have seen that a lot of Olson 30’s have the foreguy led to a point near the bottom of the mast. How do you keep the pole stable in heavy air? We have tried raising the pole at the mast to creat a better angle to the foreguy with some success, but it’s still not great.

Any tips for kiting with this setup or rerigging the pole would be much appreciated.