I don't know if you should give out Shell Smash so much. Sure, it makes sense for Blastoise and Torterra to get it, but they'd be completely unstoppable. Also, I'd think it'd be better to retcon Psychic's interactions rather than turn Psychic types to fairy types. Many inherently mediocre types...