I am aware of the problems, UPnP has. UPnP allows applications to automatically forward a port on your router and malware can take advantage of this feature. You should be able to switch off this feature in your router, which will not affect the usage of everything else UPnP offers. UPnP had other problems in the past, which were solved with updates.
And when UPnP will be exchanged for something more safe: I’m all for it!
Edit: I forgot to thank you for your concern, which really is appreciated!