I would have asked at the beginning that the bottles be pre made as well, then just keep them in the fridge until it's time to warm them up. Then I would rinse and send home.
Being as he's only going to be on formula for another 2 weeks though, I think I would just let it go and deal with it