Jeff, Your description appears to be in compliance with the Code.
Three wire to the sub panel and seperated grd. & Neutrals.
Using conduit for the ground path from the service disconnect to the distribution panel is a design consideration, but does comply.
Ask the AHJ about the neutral and his reasoning.
We all want to know.
Alan--
