Yes, I think all your states should be put under 1 tag or something.
Yes, limit the states to 3. 5 is too many. Five states is too exhausting to keep, but if you only maintain 2 states, then an active player with 5 states will wipe the floor with you.