You're welcome, and I'm glad to help!
One more remark on the elemental switching: I think the stat boost and weakness things are an either-or proposition. Either the element determines weakness/resistance OR it can influence stats, but not both. Us veterans of RPS elemental systems are familiar with how they work and they effectively become a matching game, and if that's the gameplay you want definitely go for that; but what about one that focuses on just the stat changes? Maybe that would result in a more interesting gameplay loop? I don't know, maybe I'll try that some jam if you don't (or maybe I will anyway 😛 it's not like anybody has a monopoly on these mechanics).