I am in the same situation as you are and I am not happy. Fortunately I have learned to test all the features I need in VM prior to upgrading my "production" installation and right now I stick with...