I think you should switch to layer feed now.
It will do no harm to the non layers.
https://www.nap.edu/read/2114/chapter/4#22
I also think you may want to consider switching from the whole grain feed to a crumble or pelleted feed to avoid picky eaters being able to choose what they want to...