I'm in a similar situation, but I suggest having a look at a 950 'in the flesh'. I was completely underwhelmed so will wait and see what comes along as there are quite a few nice WM10 devices coming along, not just the fabled Surface Phone but things like the HP Elite X3.
May be OS still not fully ready , but in few times OS will be full accessible for the lumia atleast for Lumia 950 , may be not for all , but for it will sure
Now granted, I have an L950 and I think the hardware is stellar with the exception of the creaky back. The display is top notch and the size of the phone is perfect for me, I just wish they would have launched this phone much sooner with 8.1. I sometimes swap my sim back to my L920 because I miss the solid build quality and for me the L920 takes better pictures than the 950. I am sure an update at some point will change this though.
I'm personally waiting... the 950 would be an impulse buy considering all of its issues and this awkward transitional phase for Windows on phones. You'll probably have to wait a solid year though. No Surface phones until 2017. That's a good thing though... should have a more mature OS and a solid enough slate of universal apps coming to the table by launch day.