Hey Trey - You've got a great start going and I think that the most important thing that you're doing is playing. Alot of the time you just don't get the time to play so no matter if you spend 10 minutes playing scales and another 10 just noodling around as you call it is great. The more you play the easier it becomes and the more fun you'll have with it. I find if I alternate between doing scales and then working on something that I really really want to learn, it makes things alot more fun. I also found that spending shorter amounts of time on things made it alot easier too. I could play for an hour and cover 10 different things so alot of it is really up to want you want to do and where you want to go with it.
Hope this helps out some.
Don't forget - H A V E F U N !!!! :p