I think you're the odd man out, Malcolm.
I've never heard of anyone putting an enter key where the caps lock key normally is.
Having the control key there, though, is not uncommon at all. Lots of Unix-based machines have shipped over the decades with the control key and caps lock key in each other's position (when compared to other PC keyboards). We still have at least a hundred Sun machines on campus with keyboards like this.