Redoing the demo sounds like a solid plan. Although it's going eat up a tonne of time, it's going help you refine your game to your current image