I'm late to the party by about a year, but I thought I could chime in in case you still haven't figured something else out or if someone else comes across this by googling.

Look into the "thinkpad-scripts" at http://thinkpad-scripts.readthedocs.org/en/latest/index.html
they provide a dock and undock script that you could utilize to apply your workaround every time you dock and undock.