> "Folk" I think also carries the connotation of traditional instrumentation and musical style, whereas pop is allowed to evolve. I'm not sure whether there's an umbrella term for music in modern musical style with accessible modern instrumentation.

This is a very good point. I think it would be like folktronica or indie folk or neo-folk or something else that's considered a folk subgenre.