I never thought of Kate as a token straight maybe because it's so common for straight girls to hang out with LGBT people. Tommy always stood out as The Straight Character in the team in the latest run. The fact he's the most underdeveloped of the whole team doesn't help much. Even Eli had storylines and meaningful relationships with the others while Tommy has always been Billy's Straight Twin Who Makes Jokes.
I hope New Avengers is relaunched as a new YA with Billy calling all of them to be a part of the team.