Should I got full tubes or stick with hybrid amps?

The description of your room makes me suspect that issues there at least need to be sized up properly before gear changes. I have very low ceilings and they helped eliminate a lot of speakers -- and I knew it was not the speakers fault. But if you don't have low ceilings, there is a lot you can try to see if you can mitigate those headache-producing highs. Once you hit some limits in how much better it's getting, you can reassess how your current amp works or doesn't and then move ahead with gear changes. I'd just hate to see you buying more gear and then realizing later that the room is still the main culprit.

I have never heard ONIX loudspeakers but the web says they are 88db efficient and warm sounding. I think I would dump the tubes and go solid state, maybe a Musical Fidelity integrated. Low efficiency and warm loudspeakers don't really cry out for tubes. 

@russ69 
How would the Musical Fidelity compare with the Yamaha AS801?

@hilde45    
I'll throw some comforters and pillows around this weekend and see what happens.  

How would you treat this room?  

https://ibb.co/pJ0pxVx

I have the Yamaha A-S701 (same as 801 w/o the good DAC), and at first I found it to be a hard in the treble.  I did several things that addressed this, and the sound is much better than I would have thought it could be.  

First I used vibration control footers underneath it and a weight on top.  I also replaced the stock fuse with a HiFi Tuning Supreme Cu fuse - these tend to give a warmer sound.  And, of course, I used a decent power cable with it.  I was surprised by how much it improved the overall sound and relaxed the treble.  Of course, I would recommend these tweaks with any amp - it's not just the A-S701 that benefits.  That being said, if you are looking for a smooth, non-fatiguing top end, the A-S801 is probably not the ideal amp for you.  

Just my two cents,Scott