This new study, published in 2023, apparently found an older Neolithic population in Morocco who had more European farmer ancestry than the population in the study from 2018 by Fregel.
They claim this Neolithic Moroccan pop was around 80% European farmer (which includes 10% Euro Mesolithic admix).
These new samples are not in G25. So i can't look at them myself.