Sounds like a Happy Ending coming up in a day or so. Glad to hear he dealer is being decent about it. 
I would have preferred he give me two qrts and let me do it. I'm paranoid that they write one thing on the work order but then substitute the basic fluid/part when doing the work
I think like you

Dealership service departments are less than perfect.
Here is one for ya. This is direct from a Ford mechanic that I would have no problem having my vehicle serviced by him. It something simple but it illustrates what kind of system the dealers are operating.
This guy gets paid by the job; book time, which means he gets a certain amount of money for a job even before he starts it. The dealership doesn't care if it takes him 1 one or 10 hours; he gets a predetermined amount of money, but does get a commission on parts. Commision on parts gives mechanics zero incentive to fix old parts even if the fix is minor; bad system.
Ok, he gets a Ford Explorer for a service of some kind. The customer is gone but wants the air cleaner checked and replaced only if it needs it and if replaced they want to see the old one. It takes 15 minutes to get the air cleaner out of this SUV and 15 minutes back in. If he looks at it and it is good and it stays in the car he does not get paid for that 1/2 hour of time spentg. If he replaces it and the customer does not agree with his determination then he puts it back on his time. Sounds retarded right? Well that is how service departments are run. Mechanics are nothing but sub contractors in most places.
So what does this guy do? He doesn't even look at the air filter and reports it OK, but needs change next service.

I also know for a fact that at a Toronto Volvo dealer mechanics routinely switch old parts into customer cars and take out the never ones and sell them.