We do believe that this is part of the gameplay loop (upgrades are a risk situation, and you are not always on a good position to do it). Yet, I hear you, with the current polish there are a lot of situations that it just seems bad designed. For a complete version we will rework on this system for sure. Thanks a lot for the feedback!