Have you considered going to a power-to-weight spec and using impound dyno's to police it? I know there's always the multiple tune/switch option to defeat this, but make that illegal. Find a switch to chage tunes and you're out. They post race dyno option seems to have worked for GTS, the top 2 in GTS2 got bounced at NASA nationals due to too much hp. Maybe instead of peak hoursepower, integrate the area under the torque curve, and divide that by weight. You're a smart guy, you all are, and that's why I'm sure we'll have a solution.