I really like you focused on the core classic game, but with enough twists in there to make it interesting!
One thing is that on my first playthrough despite making it to level 10, I only saw 2 challenge modes. Maybe it's better to have the player see one of each in a random order before repeating