+1

At least reduce it to one swap a round, using up your one item interaction. If you don't want to make it too complicated...