I think, you answered your own question - you are ready to upgrade the amp. Cost is always a consideration, of course. I too would not be engaging in endless tube rolling after 20 years of owning a piece.
Without knowing anything about your taste, system and budget, it is hard to suggest any brands, but you didn't ask, anyway.