Good story. If they were able to tell it was a 2400 psi tank they would have been staring straight at the DOT specification, which of course indicates it is USA-legal. I think at that point I would have grabbed the tanks and left since the guy obviously didn't have a clue, and those are the sort of people who screw up tanks.
As far as rust goes, there really isn't all that much in the regulations (in this case, CGA C-6) about it. If the rust is causing actual pitting, of is bad enough that the inspector cannot examine the inside of the tank for pitting or other damage, then its too much. But a light blush, or even worse, is OK.
Flash rust or water in the tank is always irritating, but pretty common given how many tanks a hydroshop has to do to make a decent pay. Of course it was their fault - tape is more likely to keep residual water from the hydro in, than let atmospheric moisture in. But most industrial customers wouldn't even complain, so you can't really blame the shop for trying to blow you off.
What you need, as others have pointed out, is a whip. Let's you do a light derusting anytime you like, and also useful if you ever get into O2 cleaning. You can buy them, but they are really easy to make. Take some braided steel cable (preferably stainless), like the stuff they sell for garage doors, and hose clamp a bunch of 18" to 24" lengths (doubled over) to ta 30" or so 5/16" or so steel or aluminum rod. Get a 1/2" NPT pvc bushing from the hardware store, screw it into the neck of the tank, chuck the whip into a drill, and flail away. Can be used wet or dry, or even with a phosphoric acid solution for more serious rust.
I would never take a steel tank in for a hydro or visual without doing a quick inspection and cleaning as necessary myself. Too easy to fall into the "hydro trap" where a tank has typical neglible flash rusting and the shop insists on tumbling it, then, insists that it needs a hydro since it was tumbled (which is bull****, but that's another story). So much easier to just prep it yourself.
Here is a taste: When I dropped my Fabers off at the hydro facility explaining they were low pressure tanks, the guy said , "no, they are high pressure tanks; see, here it says 2400 psi. Hmmm, they're made in Italy, so I don't know if these are even approved for use here."
I thought, "Oh this is going to be fun."