Hobies said to be working on something. Till then, take a look at the Batboat thread. Maybe someone can improve on that deflector design. It does what you want.
Longer Amas will help keep the AI nose up. And improve the ride.
On the TI, hiking out and back are options for la Gringa. Or a quarter deck for you could elevate your status.
We've been discussing bow design and nose cones in other threats lately, but I mention sailing position because it can prevent many nosedives from starting. That and loading the boat with more weight aft.
You might try furling more on downwind runs, or unlocking the cleat and working the sheets as you accelerate down the waves, to depower before the nose stuffs.
Welcome back Gringo. Out on probation?