I'd love to tell you it gets better, but . . .
My little bloke is in the same choir as yours. It really is a nightmare and my ears hurt :(
It really is not stopping. I've finally resorted to using the paci, which we used to only use in the crib, just to get a little peace and quiet!