Looking to upgrade my CPU or GPU

I have been running Flight sim 2020 since launch day and over time, I have noticed perhaps I have more of a CPU bottleneck than GPU. I would like more computer hardware experts to help make an informed decision. My current PC specs are:
CPU - Ryzen 5 3600
GPU - RTX 2060 with 6GB VRAM
RAM - 32GB at 3200 MHz
Storage (flight sim installed on) - 1TB SSD

So far, I am coming across Ryzen 7 5800X3D as a suitable upgrade to overcome the “limited by MainThread” message in Developer mode. I have included the screenshot of the stats when spawned in KJFK with FlyByWire a32nx Development version and FSLTL AI traffic set to 80. The current graphic settings are also included. The Nvidia CP settings are included.

Appreciate all your help.

image

image

image