There might well have been an odd Yamnayan or CW insertion here or there; but in the samples I've seen, neither Yamnayan nor CW samples fit at all, neither with Bell Beaker nor with the Iberian Bronze Age.
What does fit with the Iberian Bronze Age is a pretty even mix of early Iberian R1b (essentially Balkanic), German Bell Beaker (more Steppe-heavy Balkanic) and Iberian Neolithic. I cannot see that disease or starvation would have killed off all of the Iberian Neolithics, as Iberian Bronze Age DNA comprises too much of their DNA. If nearly all the Iberian Neolithic male lineages died out, then it would seem to be conflict with R1b people that finished them off, as their autosomal DNA (presumably derived from their females) did reasonably well.