Engine Break-in
Regarding your Oil questions.
The latest version of Shell Rotella 15w-40 (the one that says "triple protection" on the label) now meets the auto designation SM and the new diesel designation which requires it to have less zinc. The other viscosities are still SJ or SL which is what you want. I spent about 20 minutes looking at every brand and viscosity of diesel oil at Advance Auto (Mobil, Shell, Chevron, Motorcraft) and all others were either SJ or SL.
Also, STP engine oil supplement is supposed to have more zinc than any other supplement on the market, likely a good alternative to the GM supplement if you can't find it.