P: Windows 10 update has broken Wacom pen right click function

The new Windows 10 update (I installed on the 20/11/2017) has broken the right click function on the wacom pen in Photoshop. When you right click on the pen to bring up the brushes the program uses the currently selected tool as well. All tools seem to have this bug and it can be seen in the history drop down effecting the canvas. This break the workflow completely as every time I change a brush an unwanted tool effect happens (unwanted brush stroke, unwanted move, unwanted marquee selection)

I have updated to all the latest wacom drivers and the latest photoshop. I can reproduce this using a Wacom Cintiq 21UX and a Wacom Cintiq 22HD. I have also turned off all the known horrific windows 10 pen ink and flick issues.

Is there any work around or fix for this?

Damian