Dear david,
Is this lens anything unusual? You could try out different distortion models, maybe that will help.
The circle is the ideal approach but mostly works only for smaller objects and it’s very often not possible for complex large structures like buildings. It is more important to cover surfaces at more or less perpendicular angles and then connect those areas. No sample images?