More choice= more confusion...
I would second the idea of looking into a Tartan 30 (or the Yankee 30, FWIW).
If you are interested in adding another solid and fast boat or two into the mix, a couple of well constructed and fast 30 footers would be the Ericson 30+ and the Olson 911S, the later built by either original builder Pacific Boats or later ones by Ericson.
Another classic with a nice easy motion at sea is the Cal 34-3. The Mk 2 has the same hull, but I like the interior in the Mk3 a lot better.