I think the fits could be better if you used more proximate sources. How many dimensions did you use in the PCA?
What EEF did you use? Considering you're using Yamnaya_Samara and testing a North European population, I think the analysis could be a bit more useful and accurate if you used a LN or Chalcolithic North European EEF, which would probably include more WHG. I would also add, besides EEF, Yamnaya and SHG, a Caucasian/Iranian source, since we know it came to Europe at least from the Chalcolithic. But it wouldn't probably change much, since you're from North European heritage. In any case, did you try using WHG and EHG separately instead of SHG to see if the fits become better or worse?
This is what I could find for TRB samples using 10 dimensions (I've noticed when some of the reference populations are chronologically too distant the fits are much more plausible when you use fewer dimensions, unlike when the comparison involves chronologically closer populations, e.g. medieval vs. modern individuals). They show no EHG. On the other hand, using the same model, SHG can only be best modelled as ~51% WHG + ~49% EHG.
[1] "distance%=0.4562 / distance=0.004562"
Sweden_TRB
Barcin_N 72.5
WHG 27.4
[1] "distance%=0.6826 / distance=0.006826"
Poland_TRB
Barcin_N 81.6
WHG 18.4
[1] "distance%=0.2766 / distance=0.002766"
Sweden_LN
WHG 33.4
Barcin_N 26.6
CHG 25.8
EHG 14.3
[1] "distance%=0.7324 / distance=0.007324"
Sweden_Motala_HG
WHG 50.9
EHG 49.1
For other Neolithic and Late Neolithic (interestingly, Sweden_LN looks somewhat steppe-like with its high CHG+EHG):
[1] "distance%=0.2766 / distance=0.002766"
Sweden_LN
WHG 33.4
Barcin_N 26.6
CHG 25.8
EHG 14.3
distance%=1.0282 / distance=0.010282"
Germany_MN
Barcin_N 79.7
WHG 20.3