Upgrading idea

Hi All,

So I am thinking of upgrading my studio strobes now that I am back to my hobby.

What I have:
2x PCB WL10000 ( bought those almost 20yr ago ) only 3 settings.
2x Umbrella ( same age )
White backdrop, black backdrop
Flashes I can use: 580exii, 550ex, 430exii

I am thinking of getting another light for use as main light:
- 1x ABR 800 Ringflash + 30" moon unit
- or Just 1x AB400
- Umbrella softbox 42"-43" octogonal type.
- Some snoot, grid etc for it.

What I want to take:
- Indoor shots, family portraits, fashion/glamour/boudoi​r.

What do you guy think?
And any other suggestion?

Thank you.