I worry that high protein, rich kibbles are also an invitation for rapid growth and pano.
I'd look for a large-breed puppy food. Fromm makes one, but there are several brands that also do. 4Health and Diamond are interchangeable (4Health is made by Diamond), so if you want to switch away from 4Health, then avoid other things Diamond makes too (TOTW, Costco/Kirkland, etc.).