Apologies for the late response - for some reason I never got a notification!
That’s a pretty clear solution you have there. I ended up doing something similar, before falling back to non-Substrate material setups. Knowing that Substrate is more powerful, and that it’s going to be the defacto material system by default at some point, I’ll definitely work with it more.
Thanks for sharing your approach, it motivated me to dig in more.