Perhaps warm tubes is what you need, not a warm amp.
Also, room acoustics might be at work.
Before you swap out gear, try to analyze your room with REW. The time and trouble it takes to learn to analyze your room is a fraction of the hassle of playing gear-swap whack-a-mole.