Beastie

Went out into the garden and noticed the sunflower was out so went to get the camera. Noticed this beastie nearby which has a long whip-like tail. Looking through the books it looks like it could possibly be a gasteruptiid wasp with the tail being an ovipositor. But with so many knowledgeable people on Blip please let me know. It's on a white flowerhead which seems to be very attractive to all sorts of flies, wasps (real wasps), bees etc. Mrs P thinks it's Orlaya grandiflora.