I suppose "folk/punk" can set you up for disappointment, but give a listen to this Canadian singer/songwriter, Eamon McGrath, who clearly has a lot to say and a desire not to be pigeonholed in one "genre". The common thread is his songcraft and his strong, ragged, affecting voice.
Here's a video of him playing "Machine Gun Cowboy" live:
I dig the feedback. The vocals are good, the band is good, lots of emotion there, but it's the feedback on the guitars that puts it over the top for me. I'm looking forward to hearing more from him.
Buy at White Whale Records