Thanks nevin, I was able to get it working with that under TMK.
I was compiling the TMK version with Makefile.unimap.rev2 which is U2 and not .rev1 which is U4. Strangely, the QMK version has a rule.mk that has a line MCU = atmega32u4 but it's just as unresponsive as compiling the U2 target under TMK.
As far as capslock, I've got that key bound to shift and that's good enough for me right now.