I'd make a deal P2P. It can be nice to buy codes as well if you feel more comfortable holding fiat until you hit your buy target.
Speaking of P2P, I was amazed at the demand , when I posted a simple localbitcoin ad in my area. I first started at a 15%+ MtGox price. I got so many responses it was overwhelming. I began to believe that I was trading them too cheap. Even after 20%+ I was getting tons of people wanting to trade.
And yet I got no responses at ~8% above gox.