Zoom Tool has gone mad!

I hope someone can shed some light on this. I recently upgraded to Windows 10 (because I had no option but to do so even though I detest it) and at the same time installed the latest version of Photoshop, but since I did this my Zoom Tool has been driving me mad! I usually click on the little magnifying glass icon in the tool bar and click in until I'm zoomed in as much as I need to be, however now it is so oversensitive that one or two clicks zooms in to the maximum possible amount and I'm looking at pixels - sometimes only one click and it does this. I now have to use this tool really slowly and carefully otherwise it just zooms in far too far and far too fast, and it is slowing down my workflow. I've been into 'Preferences - Tools' and tried it with and without all of the different Zoom tool options and none of that has helped. Can anybody shed some light on how I can fix this?