Actually I don't think the Tornado qualifies as a B-class anymore (too much sailarea) and would now fall into the C-class category.
My personal optimal listing would also consist of only multi-manufacturer Formula boats and I consider the A-cats to be a formula type of class as well.
Wouter