The correct use of the term "Folk" is as per the 1954 definition (or close). What we need is a word for the other stuff. The horse music. If it sounds vaguely folky, I think "neo-folk" would do. But of course some people seem intent on hijacking the word "folk" to mean (like Tweedledum and Tweedledee) whatever they want it to mean.