Make a serious attempt in switching to vim for everything. Print out some cheatsheets and have them on the wall next to your monitor. There are also quite a few vim threads on HN which might be of interest to you.

It took me about a week to feel really comfortable with it, but now I'm really glad I didn't give up. I still learn new shortcuts every other week.