Bang on, Ian. The early Floyd always sounded folkish to me - until I discovered dubious substances and lay on the floor with speakers either side of my head and Echoes scrambling my brain.
In fact, it's probably Pink Floyd that made me what I am today and yes, if you send them the wool, they'll make you one, too!.
And some of the Barret/Mason/Gilmore canon has undergone the folk process - certainly if some of the jams late at night at Sidmouth are anything to go by. I've heard Money and Shine on You Crazy Diamond both played in the wee hours. Not played well, mind you, but certainly played (and joined in with, if that's not terminally inexcusable grammar!).