You should know by now that you can wait forever on m$ bugfixes
But well you never know, maybe one day. Windows might be your thing and there are things to like about. Nobody tells you to go open source or to another operating system. But I'd think a bit more realistic and say that windows is just not so good on security at the moment and that you take the advantages windows has for you over the risk. You don't choose operating systems just on one aspect of them.
I think in the christmas holidays I'll be going to install freeBSD as well. It looks pretty cool as well and I still have HD space. Maybe slackware as well.