I'd advise you to leave the burning platform, Microsoft has pulled nearly all their development talent of Windows 10 Phone, hence why the Lumia 640 still has no wifi calling and desktop messaging integration is still broken. Additionally, the abject lack of new devices shows their commitment to the platform, hell, they are even selling Galaxy S8's in the Microsoft Store now!