It looks like a well-marked Epistrophe eligans to me Anthony. Does it key out in that direction?

I guess that's right - it falls closest to the 'exceptionally yellow' variant in Stubbs and Falk.  I think the bluntness of the markings on tergite 2 had me wandering towards key 22b.  Thanks Martin.

A