I'm a little late to this thread, but I thought I'd add my $.02 on the "yips" topic.
My son and I listened to this podcast together on a long road trip, and it has lead to some great conversations about limiting extraneous thoughts during the game.
https://hiddenbrain.org/podcast/stage-fright/
TLDR: Research shows that if an elite athlete thinks about mundane mechanical aspects of their craft (pitching/hitting mechanics, bat/ball grip, stride length, etc.) while performing, it significantly decreases their athletic performance.