I think your instincts are correct. If you want to make a jump in sound quality… your integrated amp is the place to look.
First question… integrated or separates. If you want to keep moving over time… then you want to go to a separate preamp and amp. Given what you have I would think upgrading to Audio Research would be the obvious next step. Either integrated or separates… Separates would be best. Alternatively Conrad Johnson… for a slightly warmer presentation… or VaC.