Good on Ya for persistence !! That is what it takes to improve on guitar..... desire and practice, practice and more practice. Keep running the scale patterns, not for hours at a stretch but try to make at least an hour total time by the end of the day. If you can, recite the notes that are in the scale as you play them and in that way you will also locate all the notes in any key signature. A real help when transposing on the fly, or improvising over someone else's chord progression. There will be (of course) some that will not agree and feel that the actual notes are not as important as the sound, until it comes time to create inversions or wander out into the Jazz 6/9 chord region.
As for the barres, you should be trying to make your "open" chord shapes in the first position without the index finger, and getting the "pinky" in the game as well. When you start moving those shapes (grips) up the neck you will already have the dexterity and finger strength to fret your notes cleanly. Start with the "5" chords (root +5) and learn where the roots are on the two bass strings . When playing your "set list", take a stab at doing like the first verse with open chords, and then the second with all barre chords, or just revert to the barres for the bridge and chorus. That will help your ear in selecting which grip to use based on the actual sound rather than convenience..... first position and second position chords of the same name do actually have different "characters" and are not always harmoniously interchangeable. Experiment ! and above all Have Fun with it !!
Oh Yeah.... Welcome to Chordie !!
"what is this quintessence of dust?" - Shakespeare