PC upgrade options. Looking for consensus.

I currently run a 1070ti and a Ryzen 2600. This is paired with a B450 and 16gb ddr4. The mobo is compatible with series 3 Ryzen. I play at 1080p 144hz. I would like to go 1440p eventually but not a huge deal at the moment.

With the 3000 series coming, I plan to upgrade and have two options.

A) go straight to the 3080 and slap her in

B) get the 3070 and a Ryzen 3600/3700

Let me know what you think! I appreciate all opinions!