That actually sounds like a big improvement over the original. But I don't think the draw function would work well in a more action-oriented gameplay style. Maybe just have magic as regular consumable items you can get from enemy drops and magic shops.