Yes, if you upgrade during gestation time is reset, but as you upgrade it gets shorter.

The free one was almost certainly the "hopeless" one, the one for Tokens is usually ok to really good.