When I made the switch to Dvorak I used this site: http://keybr.com/ (they also support the colemak layout). I wouldn't recommend swapping the keys on your keyboard as the contours of the keys are typically specific to their qwerty locations. If you happen to be in the market for a new keyboard a blank one is your best bet for assisting your transition. Filco makes a ninja keyboard with the labelling on the front of the keys, which can be nice if not all the users of the keyboard can touch type.
I guess my best advice is to stick with it and resist all urges to "flip back for a just a second". It can be extremely frustrating when you are chatting with someone or need to send off a quick email and your layout holds you back, but like learning a new language, hold in there and you will end up getting the hang of it really quickly.
https://github.com/clojure/core.async/blob/17112aca9b07ebba6...