Then again, maybe this...

This is what I'd do in your position. In fact it's what I do do - RayFlash ring-flash adapter
http://www.flaghead.co.uk/pages/ringflash-range.html Haven't I mentioned this to you before ages ago?
Get a 580EXII, plus the RayFlash. Good for macro, and you can control the light with some custom cut sections of foil-backed card and velcro tabs on the flash (its less Heath Robinson than it sounds). Very good as a fashion ring-light. The 580EXII/Ray Flash combo will also act as a master to control the 430EX as remote unit.
But there's more. You now have a two-light E-TTL strobist kit for portraits and stuff. Three lights with the 7D's pop-up. You can do some really cool stuff with that, and it takes your photography in a new direction. Get a couple of brollies/softbox and stands from FITP for not much money and shoot your new neighbours.
Only thing I would say is that I use the original RingFlash Adapter, RayFlash wasn't available then. They are actually quite different. RingFlash Adapter is a bit bigger and I know gives even coverage for macro when used pretty close - fine at 1:1 with 100mm macro. You'd need to research how good the RayFlash is used up very close, though I'd guess it's fine. Apart from that caveat, I think the RayFlash has the edge - a little more efficient I believe, fraction lighter etc but I don't have any power problems with the original and neither would you with the ISO potential of your 5D2.
That's what I'd go for, mainly for the good ring-light and strobist portrait options. If you want to get serious about macro, around 1:1 or higher (I hardly ever go that close) the dedicated macro flash is the better choice.