You might try checking with AHFC (assuming that's who you leased the car with) about extending the lease by, say, 6 months. That'll get you to new HCH territory (assuming that it will be released at the same time as the regular 8th-gen Civic), past the "I have to have it now" crowd (and, thus, avoiding markups over and above MSRP, and perhaps even putting you in a stronger negotiating position ).
I had a friend who leased an Audi Quattro several years ago, and he was able to extend his lease on that car. Wasn't through Audi's leasing arm, however. YMMV.
If that's not possible, you should be able to negotiate a heck of a deal on one of the outgoing HCHs - but if I had the flexibility, I'd at least take a look at the 8th-gen Civic once it's available in the showroom.
Now, I'll play devil's advocate - being the 1st year of the redesign, I'll guess the 8th-gen will have a few bugs to work out. So you might want to wait until the 2nd year, or at least later in the 1st year cycle. But that's probably not feasible for your situation, unless you extended the lease for a whole year. If the HCH continues to be produced in Japan, you may get a more solid car, w/ regard to body integrity, based on my experience w/ Accords. Mechanicals probably wouldn't differ.
Good luck with whatever choice you make
