I had more or less the same problem. And I couldn't find any alternatives, I went back to Jolla...

Perhaps BB10 is a choice for you. (Z30) or if you prefer something big, Passport is also a good choice, plus a really nice HW keyboard.

I know Android is not your choice, (it's not mine either), but there are some really nice HW like Sony Z5, you can do a little tweak given the device can be rooted, to remove the navigation bar and make it gesture based swipe like Jolla. Plus you can always unlock BL and flash CM or even Salifish if there is a build.

Tough choice. But I guess there won't be a true successor to Jolla, with a at least mid ranged hardware, any time soon. Hope I was wrong.