Anything that makes combat take longer is not good.

I agree that equipping shield at the end of a turn is a bit cheesy. So maybe only allow armor and potion swapping at the start of each turn, and then lock it until the next turn. Weapon swaps shouldn't take an action unless you want combat to be even more of a grind than it already is.