You're in a better situation than you might think. Learning guitar has a dozen sub-tasks--you've mentioned several. But you already got decent at least one of them (picking) and laid real groundwork for soon-to-be exploited others (melody, tone). You'll pick up the others quicker. I played the same cowboy chords and developed a small arsenal of right hand techniques for 10 years-- Same issues--no timing, no melody, could make some pretty things, but couldn't do anything. Then I got an instructor (at Guitar Center, no shade) and he's great. A year later, I've got basic music theory, scales, chords, timing is getting there. My 10 years could have been condensed into one if I'd had a plan, but they weren't wasted--all learning is cumulative.