Sounds like solid plans. I’m looking forward to the endless mode! Just an idea for ongoing resource supply: you may introduce a transmutation workshop where shamans can transform equipment into resources (the equipment is ongoing due to the raiding parties). This way you also don’t accumulate hundreds of equipment items.
Edit: if transmutation also costs mana, then you also maintain a reason to keep studying after having researched everything. Instead of furniture a spell (like summon imp) could be used to that transforms all items on a square into resources. This is probably easier to implement.