Guessing at the solution...

Assuming this effects all shockwaves and not a couple of "specials"

1. Grandfather existing boats (you can guarantee most the sailors don't know they were cheating).
2. Remove builder's right to self certify
3. Ban all unsold/unfinished boats from F18 class events.