Personally, I think it’s bad to change cards. A better solution is to add a cheap cards that can remove the buff.

But I’m sure you put a lot more thought into it than me. So either way, good on you for paying attention enough to deal with it.