Cliff I have the same problem when I sail upwind in lind of heavy weather.
I tried to make the boat flat, boat did not move forward smoothly but hill and reverse hill over and over.
I found some small tips(It could not be helpful though).
Vang should be set with sufficient lenght from the first time set-up to pull it on hard.
Cunnnigham and outhail should be pull tight and you'd better sit on the boat not too backward.
In my experience, Laser has CLR much front than CE so that we should sit little back on the boat in gusty condition. but Aero does not.
It means that you will feel less weather helm than on laser.
sitting backwarad means bow can pitch much more and make the boat slow.