I think we need to take another look at classing, too, though it's probably too late for this year. Some of the classes seem a bit too broad in terms of the horsepower spread they encompass, particularly in view of dropping the subclass modifiers.
You should be sitting OK. STR,STU, STH lumped together.
As a Street Touring Pony, I got tossed to Prepared group last year. Came out in 1st again. :) This year I'm ESP since they did away with STP. Lumped with SSP/ASP/BSP with the Vettes, 911s, and SC Mustangs and Camaros. Not to mention what a prepped BMW could be. Oh well, still better than being thrown into the wild west that is CAM. I'd be 250-400 hp off the pace in that bunch