I wouldn't take back to the dealer they will just hack it up again. Most dealers details are just kids with no experience or little experience. When they get new cars they don't hand wash then they use a brush like at the self serve car wash.
There is this wax for matte satin finish. http://www.detailersdomain.com/SWISSVAX-Opaque-Premium-Wax-for-Satin-Matte-Paints_p_436.html
A bit $$$$ but works great I have used it many times.
Todd
After I have done everything on my list I do once through everything just double check! Best thing todo is get a white board and make a list! I used white board paint on my shop wall love it.
You should only be doing a 2x2 section at a time and should be doing about 5 to 6 passes with a slow arm speed. You my not be pressing hard enough to get the water spots out. I had car worse than that and I had no problem getting them out.