There is no difference at all between "contemporary folk" and "pop" it's all personal preference......and a large slice of snobbery!
As usual I agree with Iains on the definition of "traditional music" which IS a separate genre, but as the lifestyles pertaining to it's place in society are almost gone, I see it being consigned to museums or a very small niche market.
Of course traditional music has always addressed the big issues. like love, death and the human condition.....but all of these things are being torn asunder as we blunder on in our search for a "truly equal society".........Traditional music or traditional values will be discarded.