Color correct the same format you edited...720p. Upscale AFTER that. Either when you output to tape, or output a digital file, upscale that file. FAR easier than redoing a lot of the work you have done.
I do this on a regular basis. Edit 720 as that was how it was delivered to me, edit, color corect, then output at 1080.
Shane
Little Frog Post
Read my blog,
Little Frog in High Def