In terms of switching from F on the 1st fret to a G...if you haven’t already tried this, one idea is to slide the F barre chord up 2 frets to the G barre chord on the 3rd fret. Mininal finger movement and the G barre chord on the3rd fret is a nice sounding and useful barre chord to in your toolbox