Do you spin the props in or out?
Does the bottom have a rocker in it?
What prop are you running?
I would look into shortening the stakes, B/P bottm and some prop work. Alot less money than re-rigging. Your package sounds pretty good. Alittle more work and you may be there.