Also, make sure that the shop topped off the the trans fluid correctly. Our transmissions have a very specific way that they need to be filled. They need to be brought up to temperature, topped off, shifted through the gears, topped off, etc. If all of that wasn't done then you may be low on fluid which might be causing the hard shifts.
"The major difference between a thing that might go wrong and a thing that cannot possibly go wrong is that when a thing that cannot possibly go wrong goes wrong, it usually turns out to be impossible to get at or repair."
-Douglas Adams, Mostly Harmless