Next to Gretsch and Yamaha, there is also the Kala Guitalele that has Tenor scale:
http://cargo.ukerepublic.com/product/kala-ka-gl-koa-spruce-koa-guitarlele
Ohana has a Tenor sized Guitalele called TKG-70, but I don't see them for sale often. Actually, they even made a Concert and Soprano sized model.
The KoAloha D-VI looks nice; would be great if they started making an Opio version.
In the custom segment, there is Pepe Romero's "Little Pepe" that shows what a Guilele can do:
http://www.theukulelesite.com/pepe-romero-guilele-spruce-rosewood-case-oasis.html
All of the above have Tenor scale, while the "Kiku" by John Kinnard and Jay Lichty as well as the Kanilea GL6, the more affordable Islander GL6, and the Cordoba Mini are about Baritone scale.
One issue to me, too, is nut width. While most people seem to be comfortable with 2", that is too wide for me as the spreading hurts my hand, being used to the narrower necks of Western and Electric Guitars. But since you mentioned that the Yamaha felt cramped to you, I'd take this issue into consideration. As far as I know, the KoAloha, the Cordoba, the Kanilea, and the Islander all have nut width of 2" (50 mm), while the Kala is a little slimmer (48 mm).
Hope that helps!