Kirill Repin Art
May I suggest adding a book that the protagonist/player can read at any time that provides FAQs and basics so players understands the shapes and explains the puzzle system.
The book then could also be used to study in the Library (bonus discovery time), the common room, and bedroom. In this study session the player unlocks the puzzle solutions, the potion, the mind warp spell plus studying with Hermione should help to improve her well being. Maybe studying the book provides hidden spell shapes that can effect Hermione stats or create random events/dialogue/animation in other rooms
Morning class should be available in the afternoon as well.
The afternoon and evening classes unlock too soon. Soft locking them with spells discovered through the book could help with that