Should I replace my 2018 MacBook Pro?

Currently, here's what I have:

• 15-inch, 2018 MacBook Pro.
• Processor: 2.9 GHz 6-Core Intel Core i9
• Graphics: Radeon Pro Vega 20 4 GB / Intel UHD Graphics 630 1536 MB
• Memory: 32 GB 2400 MHz DDR4
• Storage: 1TB HD storage. (with 340GB Free, this is after an After Effects memory and purge event.)

I do not keep my clients' work on my HD. I use a 1TB SSD drive. However, when I use After Effects a lot for video animation, my Laptop memory runs out.

Here's my customized wish list:

• 16" MacBook Pro
• Apple M4 Max chip with 16‑core CPU, 40‑core GPU, 16‑core Neural Engine
• 128GB unified memory OR 68GB?
• 2TB SSD storage OR 4TB SSD?

I heard the 128GB unified memory might be too much, and 64GB would be enough for After Effects video animation, etc. I'm mostly running Adobe applications. Typically, I have Illustrator, InDesign, Photoshop, Acrobat, Microsoft Word & PPT, Slack, Chrome, and Firefox all running. If I run AE, I will close other apps.

Please let me know what you think. Sometimes, my current MacBook Pro runs just fine, and sometimes, working in AE seems a bit slower than it should be. Should I wait for the M5?

Thanks.