If you use 'focus' targeting, you can just have a different /focus "name" macro to handle swapping out a player. I've been lazy in re-doing my macros, so I'm still using follow/target Party1, and the party leader is my main.