When programming, you'll find (if you haven't already done so) that sometimes it's worth rewriting your code rather than desperately trying to patch bugs. As daunting as that sounds, you could very well have some "lightbulb moments", where you realise that the new code is easier to maintain and/or is simply more efficient... Literally to the point of, "How come I didn't think of that before?" and "If only I had known earlier that I could use <insert routine here>!" :)
So, keep the game's ideas and consider revisiting the code... ^^