Sounds like you are off to a good "restart". Don't worry, a lot of us have started - and in some cases, started off badly. A mid course correction is a good thing! Good luck with it.
...................
If you're not already doing this, get yourself set up where you can play along to MP3s or CD's. I find some students lose track of actually playing along to complete songs and wind up only playing little segments while practicing. There's no substitute for playing along to complete songs start to finish and locking in with the groove of the song. Logs lots of time with that.
Great point. If you want to eventually play SONGS, you got to work on a beginning, a middle (with changes) and an end.