Using mouse and keyboard for infantry and controller for flying

Playing on PC, I use mouse and keyboard for infantry, tanks, ground vehicles, etc.  When I fly, I use the controller for jets and helicopters.

Pre-patch, I could keep the controller connected and everything was fine.  Since the patch update, I have to unplug my controller from my computer to use mouse and keyboard.  Then, when I want to fly, I have to connect my controller.  When I switch back to infantry, I have to completely unplug my controller from my PC again, or my mouse doesn't work.

Is there any way to fix this to where I don't have to connect and disconnect my controller in matches every time that I want to fly?