I like mapping my right cmd key to ctrl, and doing the same thing as you for caps lock but tapping yields an escape.