I like to symlink to MacVim like so: /usr/local/bin/vim -> /usr/local/bin/mvim /usr/local/bin/vimdiff -> /usr/local/bin/mvim

Then put /usr/local/bin higher up in my $PATH. Works like a charm.