Doesn't hurt to wait. There's been some chatter that Moto will also be offering Windows Phone versions of many of their devices once Lenovo fully takes over. Lenovo has been very interested in making both kinds of handsets and sees offering two experiences on the same hardware is beneficial.
I don't see Samsung doing that, though there are still indicators that a new WP handset is coming from Samsung and a Note style may be a variety. Same goes for the LG G3. LG has a device out there and I've heard a VZW friend say it's the G3 with Windows that should launch by October across carriers.
By Christmas season, there will be more phones for Android, iOS, and Windows. Many Android handsets will have Windows options or direct equivalents (like the ATIV SE, which is not too far off the S5 spec - though it didn't launch everywhere).