I think it would be beneficial to move the team series before the individual series. Forget for a second how this would be done, and just ask yourself if it would be more beneficial? I think for most wrestlers/fans, Individual State is the finale of the season not Team State (which I can understand). Once Individual State is over, most people are ready to take a break and turn off their "wrestling mode" mindset. So if you move Team State before Individual State. Everyone is still in "wrestling mode," and it's feasible to have more of a fan turnout. Just my 2 cents.
If you agree with this, then the question becomes. How do go about moving the team series before the individual series?