I recommend Major and Minor, in all keys. All positions. Throw your own flavor in it though, a bad habit I have is playing a C Major scale all around the neck. Only a year of playing though, closing in on two; shouldn't be too hard to remedy.
Then move on to the -ians. Also, nothing wrong with Pentatonic solo'ing.
EDIT: If you have a teacher he has probably already told you this, but when you play stuff that is not your own, zero in on that ONE song. I have a terrible habit of playing a bunch of different licks from a bunch of different bands.