Well at a budget of $2000, stick to an integrated amplifier.
I doubt the Yamaha 801 is an upgrade to the Jolida, just different and likely not less harsh ( I own the Yamaha 701). With a budget of $2000 a true up grade can be found.
As mentioned by others, play with absorption materials as your room is very lively. Explore this using the two amps you now own prior to making an additional investment.
Don't recall if your room size was mentioned, what is it?
I doubt the Yamaha 801 is an upgrade to the Jolida, just different and likely not less harsh ( I own the Yamaha 701). With a budget of $2000 a true up grade can be found.
As mentioned by others, play with absorption materials as your room is very lively. Explore this using the two amps you now own prior to making an additional investment.
Don't recall if your room size was mentioned, what is it?