I don't think switching to Dvorak is worthwhile. Most people don't have the capacity to actually squeeze out the few extra wpm that Dvorak gives you, and if you do, the benefits aren't extraordinary. Plus if you use Vim, either you'll have to remember where the original keys were on the keyboard and use it solely through muscle memory, or relearn.