For 3600€ you could get the M2 Pro 16" with 32 GB RAM and 1 TB SSD which is a much faster machine than the on you bought 4 years ago, even if the specs might not have changed that much.

Could not argue about the price of a Ryzen, can't beat that. :)