I'm not a WaterCad expert, so the following is based on my personal experience with the same kind of issues you have.
Regarding elevation data, if your surveyor has it, it should be a simple matter for him to import it into the shapefile he provided…