I look at music theory a little differently than you do. To me, music theory is a tool for studying the songs that I like. So I'm not thinking "classical theory" or "jazz theory" but rather "Lucy In The Sky With Diamonds theory" because that's the song I'm learning right now. Next week it will be some other new-to-me song.
I have two words of advice for you: