Remove the magic as a resource?

With Stella as our 3rd NPC, Inc House will go through some major changes. I am working on several fixes to improve the game. One I’ve been back and forth on is the magic system. I want to scrap the lust system entirely and allow spells to be castable as long as they are unlocked. I see this as fixing the grind issues but I worry it would make the H-scenes feel unimportant. Should the lust system stay? Or should it go?

(I’m close to a breakthrough on a possible teleport system but I don’t know if I’ll finish it by tonight. I’ll post more about it later).