With the tech of integrated, at your price point it is difficult to argue separates. More cables, more space, more everything, which means less $$ to got toward the unit itself. Not to mention the issues of preamp matching, cable integration etc. Separates opens a whole new world of crazy. There are SO many excellent integrateds out there at this price point it ALMOST doesn’t make sense to look at separates. The Hegel H390 is superb, you could also step into a couple Pass Labs offerings and many others. Where you begin to limit yourself a bit is on the sub out and HT bypass requirements. The “sub out” is simply a pre-out on some amps, but others have a named sub out.
I would also suggest your speakers may be part of the problem. The B&W’s are great speakers, but not so much with metal/hard rock IMO. Something to consider.