I think there should be a way to cancel an upgrade. If I spend gold on a wrong upgrade, I will have no choice but to wait until it´s done. Wasting gold and a lot of time.
So I strongly recommend this cancel button. One small improvement can change entire game.