I worked at a vet's office for a while- they can safely take 1mg of diphenhydramine per pound of bodyweight (Indy gets the 12.5mg kid's dose).

I am going to try and just rinse him really well before I add more soap of any type into the equation. Poor thing is laying on his back on the floor, twisting back & fourth, and growling. I know he's uncomfortable