Suggestions to replace TDI?

[MDE]

I'm starting to look at replacements for my Jetta TDI and want to make sure I'm not missing any obvious choices. I have a 20+ mile commute each way, mostly suburban, with occasional stop-and-go.

My must haves:
Fun
Comfortable
Smaller than Jetta

Would be really nice:
A real three pedal manual transmission (this is almost a must)
Similar efficiency to the Jetta
More power!

Wife's must haves:
Fuel efficient
Sunroof
Leather

Budget is somewhat flexible, but around $25,000. My short list is Volt (used or CPO), Cruze diesel (would have to wait), Mazda 3 S GT, and Focus ST (would have to get ST3 for leather, may be too expensive for the wife to bear). Prefer new, but I'm not averse to something used.

I've looked at the Focus (liked it), Fiesta ST (too small), and Scion FR-S (too impractical, even for me)

What obvious choices am I missing?

 

[Dr. Detroit]

2017 Civic should get the 1.5L Turbo with the 6spd manual - Hatchback arrives in about two months.

Leftover 2015 Focus Titanium with 5spd manual can be had fully loaded for under $20K - Anywhere from $6-8K off MSRP.

They stopped making the Verano Turbo with a 6spd manual so you'd have to go used.

Forte 5 comes with a 1.6l Turbo but you must opt for the AT in order to get leather/moon.

 

[Yuriman]

A friend of mine picked up a 2016 Civic 1.5T a few months ago. My first impression was that Civics have gotten really big, but it's a lot of fun to drive, and he's still averaging 46mpg driving like an idiot. When he takes it easy, he sees as high as 50-55mpg (trip average) on his way to work.

 

[MDE]

I couldn't get over the looks of the Civic, but should drive one. Fun with mid-40s MPG will be hard to overlook. The Buick Regal Turbo was lower on the list, I ruled out the Verano because of looks and similarity to the Cruze.

I probably should add that I have driven a Focus ST and loved it.

Thank you, keep it coming!