There seem to be several very similar wasps in Ichneumonid Wasps > Subfamily Cryptinae > Tribe Cryptini. Not sure if I picked the right one to suggest.
Could this be a Papilio demoleus? It was quite large even though seen at a distance (seemed to be quite a bit bigger than the Willow-herb Day Moth which is described at approx 4 cms wingspan). The Chequered Swallowtail is bigger at 8-10 cms which was more like what we saw. It was very beautiful with its creamy yellow markings and was opening and closing its wings .
With these species what you need to supply is a photo into one of the flowers as what is needed is being able to see that black appendage on the labellum, its shape and colour but be careful not to touch it as it will snap shut and we can not tell. I can just see sufficient of the black appendage in your second photo, but only just. I hope this helps in future. Derek