easy. Just allow it to only be switched to improved after max level.
Problems solved. If necessary just drop it from lvl 6 to lvl 5 improved to compensate for any discrepancy in building costs.
Only building this doesn't work for is improved Store because of the larger building size.
Anything else is doable