That was my problem too but I discovered the Karabiner Elements app which lets you map caps lock to escape when pressed alone and to control when held down.