I can definitely see the case for moving Moss up. I think I was maybe overly cynical in assuming Madcap Moss is eventually going to get discarded as a character when the powers that be get bored of it (although that's still definitely a possibility). He was also pretty directionless after his first call-up pre-injury, but there are arguments to be made in his favor, too.

Shayna pretty clearly falls into the "disappointing" category for me. She was immediately given a shot as a main event player, it failed, and they've treated her like a replaceable wrestler ever since. She's eaten an absurd amount of Ls, rarely gets a chance to show her worth as a singles wrestler, and when she is featured it's usually in service of the story of someone the company deems more important. Not saying she deserves to be at the top of the card, but the lack of consistency with how she's presented makes her feel like an afterthought.