If I upgrade, will it restart my plan or will it renew on my original renewal date?

If you upgrade now, it will pro-rate your payment based on your existing renewal rate.