I would keep the running oval layout as a way to test trains. The new layout sounds awesome. My experience is that it really helps to have somewhere to run things during the intial build stages of the new layout.