I guess yeah
I'd say make yourself familiar with efficiency of different lighting technologies and why certain lights give you more GPW than others. I don't post in the lighting section much but I'm very familiar with pretty much everything out there at the moment lighting technology wise.
I found table 3 in this article useful for helping me understand why certain lights are better than others:
http://journals.plos.org/plosone/article?id=10.1371/journal.pone.0099010#pone-0099010-t003
Your 400w HPS would have put out just over half the umol/j (0.94) as a double ended Gavita (1.70) or CMH (1.46). So it's using almost twice the electricity to produce the same amount of light for the plants (1.8x a Gavita or 1.55x a CMH). Which is why your GPW is just over half of what you'd hope/pray for from a high end light. The LEDs in that table are old technology and you can see why old LEDs didn't produce much more GPW than HIDs... the umol/j is similar so GPW will also be similar.
The kit you linked to from Timber has 5 Cree CXB3590s driven at 50w each. They will produce around 2.5umol/j. At 250w that means 625umol/s total output. What does that mean for you? Well you got 283g of bud from 491umol/s total under your 400w HPS so you could probably expect around 360g from 625umol/j (the 250w kit) under the same conditions. 77g extra.
How much electricity saving do you make over that grow? You use 150w less for 12h a day for 2 months of flower (108kwh) and 150w less for 18h a day for 6 weeks of veg (121kwh) which is 229kwh. My electricity costs £0.11 per kwh so only £25 (around $33 US) of electricity savings over the whole grow but it cost you $499 to buy the kit. Is it worth it? Well if you grew the same total amount of cannabis then it's probably not worth it TBH because it would take 7-8 grows to pay for itself (if you include bulb prices). But if you get an extra 77g of yield then it pays for itself in 1 grow.
Now you've upgraded to a 600w HPS it gets even more blurry
That's why it's very difficult to get definitive answers on lighting upgrades!
That is what I mean by having it clear in your head why you're upgrading