Have I taken this too far?

I totally agree. I was focusing on getting the positioning of symbol layers and such right, and I wanted that to be independent of the number of thumbkey so when I add thumbkeys back in (say for weteor/grumpy) the core layouts will remain the same.