I will buy a Mac mini, 64GB RAM + 2TB. That will replace my current MBP M1 Pro with 16GB (4 years old). For serious upgrade I will wait the M7 Line.