I'd also say you ought to check the max allowed height. In my TWP, it was the "median" height that mattered....not the total height. The median height is the center point of the distance between the roof peak and the gutters.
A second floor made a huge difference for me as I put all the stuff I don't use everyday upstairs. The parts washer, the blast cabinet, hardware bins, etc...