Welcome to the big boy's club.
HPS = winner.
You might also wanna try adding a second 400W HPS rather than replacing with a 600W (unless your ballast would work with 600W.
2x400W HPS is great. I've heard 600W is the sweet spot, but for me, 400W is the sweet spot. They're all sweet.