Not sure this is the place to ask but I'm sure you'll have your opinions

It's about time I moved on from my Samsung Galaxy S which after ~4.5 years is long in the tooth. I don't think I'll go for Android on my replacement phone and definitely not iOS. My partner got a Lumia 725 a few months back and I've been very impressed with WP since.
As I upgrade rarely I prefer to buy the best model available at the time, in this case I'd go for a Microsoft flagship. It seems to me that this is a 930 at the moment. Other than the lack of glance screen, which appears to be a hardware limitation and a feature the phone will not get, the device looks great. I am, however, a little concerned given it's time on the market, that a new WP flagship will be released shortly after purchase.
So, can somebody summarise what is on the horizon for WP in terms of new hardware?
I'll be waiting *at least* another month before purchase as I want to see what the Ubuntu Touch OS has to say for itself (the main reason I've put off the upgrade for so long is the anticipated Ubuntu phone).
So, if I go down the WP route... 930 or wait for a flagship? Any idea when? And what new features/specs are expected?