Modern equivalent of Yamaha R-2000

Are there any modern receivers comparable in sound and overall quality to a vintage Yamaha R-2000 (or a CR-2040)?

I’m debating between either replacing one of my vintage receivers with a more recent receiver that has a decent DAC and WiFi built in - or adding decent WiFi transmitter/receiver and DAC devices to my vintage receivers.

Why? I’d like to stream music services, plus replace my analog (secondary) speakers with wireless WiFi speakers.

Reviews from owners of recent, comparable Yamahas like the R-N800A 2.1 or the N2000A suggest that, while they’re built well and check a lot of the expected Yamaha quality boxes, the sound quality seems not be up to par with the older models mentioned above. Considering their price tag (the N2000A goes for 3 grand), I’m a bit hesitant.

Any experience/advice? Thank you!