Yes, the current situation is not working so well, obviously.
Why not next time have Juan K use his best knowledge learned thus far but with say a 10% heavier weight requirement pretty much everywhere except ballast, and possibly reduce ballast by that same amount, as a one-design.