Joined: Aug 2009
Posts: 6,687
Likes: 5,294
From: Minneapolis
Bikes: 2022 Salsa Beargrease Carbon Deore 11, 2020 Salsa Warbird GRX 600, 2020 Canyon Ultimate CF SLX disc 9.0 Di2, 2020 Catrike Eola, 2016 Masi cxgr, 2011, Felt F3 Ltd, 2010 Trek 2.1, 2009 KHS Flite 220
As you know, this is not the best year to be in the market, but yeah, definitely go for an upgrade.
Is there a particular reason that your focus is restricted to the big 2 brands? There are lots of other choices out there. Surely your local LBSs have some other sporty options (or they will whenever they can restock again).