Kibana Point to point aggregation

Yes, the first approach is the way to go.

Can you check your Kibana index-pattern (https://www.elastic.co/guide/en/kibana/current/tutorial-define-index.html)?

Does it show two geo_point fields?