You are not too picky.
I have similar problems with my 5D3 and my L lenses.
I sent my lenses, along with my 5d2, 5D3, and 50D to get calibrated. I got the equipment back from Canon, and was very disappointed. To make it worse, I did this prior to an African Safari, and got way more duds than keepers.
If you send them in, be very careful on checking out the gear before you take it out on an important shoot.