Best AMD CPU & GPU for 1440p 240hz gaming

I recently got a 1440p 240hz OLED monitor (a huge upgrade from my old 1080p 144hz IPS) and want to upgrade my rig soon. My current rig includes a Ryzen 5 5600X and Radeon RX 6700 XT.

I play AAA single player games (e.g. God of War, RDR2, etc.) and online FPS (mostly Battlefield). Typically, I run single player games at higher settings to maximize fidelity so long as performance is still smooth. For online FPS, I will lower settings to maximize performance.

For whatever reason, I have historically had all AMD builds and would probably prefer to stick with that for familiarity.