Win 8 boot error

Windows 8.1 failing to boot when any usb storage drive is plugged in during boot.
My only solution is to unplug everything each boot unless I use my KVM switch which does not support usb 3.0.
Any ideas or should I just wait to buy windows 9.........