Mostly me-
The sunmaster is an enhanced spectrum HPS lamp having more blue which might help.
You might try using your HPI-T lamp all the way through, see how it goes. More than a few growers use MH exclusively rather than HPS with good results. You might also try using the HPI-T through the initial stretch phase of flowering before switching to the HPS lamp during the bud fattening phase.
You may benefit from fewer plants & less shaping. In dense plantings the plants compete for the light & the way they do that is by stretching.
If you read my opening post, you would know I already use HPI-T through the stretch and I also tried less plants
Strange how CMH lights are nowhere to be found here in Europe.