Eric Johnson is good. I liked some Jet songs. I've seen Mark Erelli in concert, sort of a a folkish country "rock" sound. I hate to really say country b/c people have a prejudice (myself included) with the word, but if you're feeling adventurous his CD is good, probably more new folk. Perhaps look up some bands on Amazon or other sites, they have recommendations and what other people also buy.
EDIT: I should have added,
www.markerelli.com