I am with Aaron on this one but you have to remember that changing your domain name is something that you shouldn't take lightly. If you know a lot of people that link to you already it is worth the trouble of contacting them directly and getting them to link to the new domain name.
I think option two is easier to remember and will give you a better long term seo benefit, but don't jump in with your eyes closed!