They do get better. I started early with mine. I would pretend to trim.. to get them used to the sound and smell of everything. Lots of patience is necessary. I have also brushed mine with a soft brush from the time they were little.. so they were used to it.
I am sure your baby feels a lot better after getting the snarls out.
Good luck with your grooming.