The "upgrade" being potentially bad (i.e. locking / forcing weird movement) is part of the Duality theme. We initially designed so that all "upgrade" will contain two abilities. With only 6 grids and three actions mandatory, I also find it being a little restrictive. I think that part does need a little more balancing. Thanks for the feedback!