He's a pocket passer - upgrades at O-Line and WR seem much more attainable off-season goals based on draft capital and cap space. This may involve some painful moves - trading or cutting Higbee and /or Woods maybe. Not sure what the cap implications are.
If Goff is given more protection and more potent weapons and still can't drive us far enough down the road - move on in 2022 and don't look back. They will likely draft a developmental QB to sit for a year anyway.
I just cannot wrap my head around anyone giving us any kind of picks and eating Goff's salary in order for us to have the ammunition to land a true upgrade. Not a sideways or downward move or a 'this guy just needs a change of scenery' - I don't think that's a real plan.