Didn't know you were into Country/Folk. You should check out Shakey Graves (Recommend the live Audio Tree version), Two Gallants (like Folk if Zach Hill was the drummer in the two piece), Orville Peck (Gay Canadian Cowboy who used to play drums in a few punk bands), Deer Tick(haven't listened to them in forever but they fall somewhere in there), etc. There's a few to look into if you already haven't.