For bonus question 1 I'd say IRC is be the answer.
Let's face it the 930 gets caned on IRC compared with some other designs, but between boats of the same design IRC should account for the differences in spars, fins and foils.
So, my suggestion for reinvention of the 930 class is to confirm a strict rule about the hull shape but have either anything goes or a simple max/min approach for the rest, and score the race on line and IRC. The cert will cost, from memory, less than 3 boat dollars a year.