your first two FPs are very right to save your shoulders.
Are there other important points to save the shoulders?
- A somewhat deeper spear, more as setting up the catch at once, might save your shoulders. (Together with "letterbox" a little bit nearer to your head than reaching forward.)
pull. Let your arm flow without any force to catch.
- Hold your stroke featherlight (as Terry often mentions), as if your pain were already there while swimming... Hope these FPs will help pain will never become reality anymore.