WOW!! Wish I could have been an "innocent" bystander when that happened. I would have been laughing and backed you up with a, "what's wrong?!"
Not sure as to "protocol" as far as waiting for LEO when you haven't broken any laws. Probably a good thing that you waited some. Glad it turned out ok in the end!