Go for the 580EXII. I originally purchased the 420EX but it didn't have enough power for my needs. I ended up getting a 580EX and the pair of flashes now work great as master and slave.

In your case, if you find you need a second flash, you can get a second 580EXII with more power.