That's certainly reasonable to get the game working as intended before considering adding anything else. I hope you don't completely dismiss the idea of adding more challenges though. I don't think it would be gutting the design but rather building on your foundation.
In any case, let me know when you think you have it working the way you want, and I'll give it another test.