FCL.010
'Cross-country' means a flight between a point of departure and a point of arrival following a pre-planned route, using standard navigation procedures.
There is no minimum distance nor any suggestion that the point of departure and point of arrival cannot be the same place. The important phrases are 'pre-planned' and 'standard navigation procedures' so a random bimble around the local area will not constitute a cross-country flight for EASA licensing purposes.
On the flight that you describe, only that part flown using standard navigation procedures could be properly claimed as cross-country, not the subsequent circuits
Whilst unsurprising, it is entirely unacceptable that the CAA should have given you such wildly incorrect information.