How close do you think you are with your current setup? The tube front end like your hybrid has is a good idea. Have you tried rolling the tubes at all? It should have enough power unless you’re going for broadcast levels or have a dead room.
With separates you might be able to get closer to the proverbial iron fist in a velvet glove. It just depends on where you think you are and where you want to go. Do you need more iron or more velvet? A different tube type in a separate pre might give you more options. Maybe PrimaLuna isn’t as good with SS power as they are with tubes. Do you want to get a sub and run your speakers hi-passed? There are options. When you listen try to narrow down what exactly you are missing.