Fitting suggestions please

Hi friends! I wondered if anyone could take a look at this picture and maybe offer a suggestion for my next Classic Shirt. Per my measurements, I made a size 4. I'm pleased with the fit everywhere except around my shoulders. You can see the lines from it pulling in the picture. Also, not pictured, there is a little buckling at the top of the back yoke right under the collar. Should the first thing I try be to make a size 6 and grade down to a 4 at waist, length, and sleeve length? Thanks in advance for any help you can offer!