I've voted for James Yorkston, because (a) he does actually do the odd folk song and (b) he refuses to describe his own material as "folk" ("what I do are pop songs, even if they're not very popular"). A band called Cocos Lovers seem to be walking it.