I am close to upgrading to either a 5D2 or (if I can afford it) a 5D3, and the only flash I own is a Nissin Di622 mk ii, which I use with Cactus wireless triggers for off camera. I was planning on buying a 580 at some stage, but now I see they are discontinued.
I have some product work coming up, and I would like to have 2 lights. And apart from that, I would like to start adding an extra light in for some portraits, an area I would like to practice a lot in.


I need to work out the best path - is it worth just looking at adding a Yongnuo and another Cactus trigger to my setup?

If I was to get a Canon 600, would it work as a master to my Nissin? - could I use them both together off-camera with 3 triggers?

Or is there a more cost-effective alternative, such as a studio kit?


Ideally I would like something that includes continuous light/modelling light, so that is why I was interested in the 580 or 600.
A bit confused by how all of this works.