Hey @jameslo. I basically copied what you had in your patch and implemented it in a simpler earlier version of my patch. It totally works and eliminated the click. Genius. Thank you for sharing that.
Here's a version that uses your method to eliminate the click