Improving my computer for GW2

Hello there, GW2 players!

So, lately I've been playing WvW with a friend, and when it comes to a zerg, my computer just stops try to render the game and the FPS drops even reach to 0. I know it's a common problem, but hear me out.

The same friend of mine has a nVidia GTX 1650, an old GPU. I run on a AMD RX 6650 XT. When it comes to WvW, he sais he doesn't suffer from freezes or FPS drop. He also runs on a i5 (don't know the model).

I've been thinking on upgrading my setup, specially the CPU (I have a Ryzen 5 3600), and, as far as I know, GW2 tends to need better single-core performance (even with the engine upgrade). I've been also thinking on selling this GPU and buy a better AMD GPU.

Worth mentioning: I have 16GB of RAM and a SSD, where the game (among other stuff) is installed.

And this is not only on WvW. Sometimes, on Lion's Arch, the FPS drop happens too.

Did someone happen to have the same problems?