Although Crag Tower is generally thought to have been a peel tower, I have also added it as a possible broch due to a description in the Statistical Account of Scotland.
“The Crag Tower was built on a rock of some eminence, on the E. side of Oxnam water, about 500 yards W. of the church. Within these 20 years, it was a place of the same construction with those already mentioned, but much stronger from its natural situation, being surrounded with water on three sides.”
The description given for Dolphiston is as follows:
“The walls are from 8 to 10 feet thick, built of hewn stone, and so closely cemented with lime, that it is found more difficult to obtain stones for building from it, than from a quarry. It has been extensive, and divided into small apartments by stone partitions. Several vaulted apertures are in the middle of the walls, large enough for a small bed, and some of them so long, as to be used by the tenants for holding their ladders.”
That sounds very like the description of a broch to me. I will keep Crag Tower listed as both a castle and a broch until I can do more research to try and figure out which it is.