Moth or Wasp

I haven’t researched this one yet, but at first sight it was definitely a wasp. It even waggled its abdomen up and down, just like a wasp. But something about it just keeps saying moth, from looking at the wings.

Possibly related to the clearwing moths like melittia or cephonodes. Melittia is my bet. What do you think.

Update - I am going with sesiidae, a moth. I am unlikely to get any closer than family, as these moths are so rarely photographed or documented.

Update 2 - family Zygaenidae. As close as I could get.

Dave