I went ahead and made one more big change to this setup to improve the carolers consistency substantially.

Justice, Heartbreaker and Lover do not visit when they use thier abilities.