I would point out the issue in a picture and ask them to alter the template to cut the collar further into the shirt. Worked for me. For the shirt, to reduce the billowing I'd reduce the back waist and maybe chest more than you do the front. Maybe a 1" difference. The front chest looks OK to me.
2/1/15 at 2:17pm