Sorry to read of both your disappointments on the rollers
positive that both are hopefully easy to rectify to get to be top cars
A phone call to H&S would be my suggestion

I know they will 'tune' the exhaust to what you want(or at least they used to) Tell them what you want and go there to have them fit it.
Looking forward to reading future posts when all problems are rectified