Jep. Eric Johnson is a very good place for intermediate players. He plays many different styled songs and they are not super mega difficult, but they are still a challenge. Some of his songs are really difficult, but some of them are really good for practicing different kinds of techniques. My other suggestion would be Joe Satriani. If you look away from all the wanking (wanking is not a bad thing btw!!!) there are some really good melodies to play as a solo kind of thing. "Flying in a blue dream" is a very good song to start with. "If I could Fly", "Super Colossal", "summer song" and so on. Listen to his music and find the songs you like the best and then find the tabs.