Wow, sounds like you are doing great!! It's awesome that you are learning some songs as you are also learning chords and scales. I think that's critical in keeping your interest, allowing yourself a big sense of accomplishment, and having fun - that's what it's about, right!?!?!

Keep the pain thing in check. It sounds like you've taken some good steps, but if it lingers or gets worse again, you might want to take a really close look at your position, how much time you are spending playing, etc. Hopefully you continue on the mend!!

Fanstastic job - keep it up!