Difficult one!!
I am using the diopters at the moment because I don't have a lens that I can use the Raynox on - but if I did have one or more I would probably go for the Raynox as it does fit more than one size and because of the speed you can take it off or put it on and so get a grab shot if the occasion presented itself.
I am in S.Yorkshire, if you are close enough I could meet you somewhere and you could try both to see which you prefer?