I just purchased your demo and it has the EXACT structure I was looking for. GB Studio has great potential but I haven't been able to master the basics to make something like this. Not sure how you feel about making the structure of this game available for download, but I'd be happy to pay for it. If I had the main structure of how you have your game, I think I could use it as a baseline to edit.
If you are willing to post it, please let me know.