Hi! Please make sure to not adjust admin boundaries in this type of edit. It is not unusual for them to meander back and forth across roads and streams, and almost all of the UK admin boundaries in OSM are derived from an authoritative source. I have fixed Ampney St Peter already by resetting it to the official boundaries, but I will be checking other affected areas.