For version 2, I pulled the thumb switch closer, made the switch holes 15mm, and minkowski'd out the sharp corners. The switches don't fall through now, but there is a gap that's too big to fix with hot glue.