avetma's option seems quite reasonable, maybe I'll switch to that one, I'll see...Kassaa: yours is impossible because one is forced to use 2 on the note right before the D (I probably should have mentioned this)
Personally, I'd stick to what you originally had 1234 1234 ... the thumb crossing is no different than a simple C Major scale. I just learned the Beethoven 32 Variations in c minor, and there's one variation near the end that has several ascending scales in a row, and the easiest fingering for them was a fingering that didn't conform to the standard scale fingerings.
In C major you have 1 2 3 1 2 3 4 but not 1 2 3 4 1 2 3 4. If this is easier option, why not take advantage on f#? For me it's much easier even in high tempo...
Surely you're not suggesting that a C Major scale is ONLY ONE OCTAVE... Your fingering is good too -- I didn't mean to say it was wrong, and it might actually work better, I don't know. I'd actually have to see the next measure to say for sure. The reason I suggested keeping that fingering is because it uses less thumb crossing, which makes the movements simpler and more fluid (based on this one measure).