Without wishing to start a never ending discussion about what is and isn't folk, can I suggest you take up Dick Greenhaus's suggestion. Topic's mammoth VOP collection just about says it all. Then you can add the singer/songwriter/revivalists.
And no, I am not knocking anyone.