A simple way to interchange upgrades on a wand when applying a new upgrade in an already used slot-
Applying the upgrade will then switch out the oldest/first added upgrade and apply the new one, and you can cycle through until you get the right combination you want.

I think we got this all working nicely, yeah? :)