Can't really help in your area, but you might try fire extinguisher services instead of dive shops.
This is the place I have used for the last 15 years for hydro's:
Tampa, FL - Protegis Fire & Safety
They do hydro's on Thursday's, drop off on Wed, pick up on Friday. Also, about half the...