Best GPU upgrade option now that the 50 series completely boomed out?

I currently have a 3070 in my PC and want to upgrade. My current specs:

Ryzen 7 5700X
RTX 3070
32GB RAM

My CPU will upgraded to Ryzen 9 9900X, but now my question is:
What is the best bang for buck upgrade, now that the 5080 is completely collected by scalpters?

I am not really looking forward to spend 2k on a GPU... up to the price of the 4080 Super should be ok tho.
So is the next best option 4080 Super? Or would you recommend waiting? Because i don't really know how supply is handled in the GPU deparment... i am quite new.