The Prometheus was a warship, too, and the New Orleans class was a frigate, so probably primarily a warship.

If you want to get really picky, there's also the TOS Saladin class destroyer and Federation class dreadnought, Franz Joseph's old designs from the 70s which gained technical canonocity when they appeared on readouts on the bridge of the Enterprise in "The Wrath of Kahn."