I checked that 240.21 (C) and you were right on with that. We may leave the 2 Disconnects alone and change a distribution panel downstream from those.
Stay Safe