You are not the only one who had that problem.
One solution would be to have selectable upgrades but I thought it took away from the gameplay to much.