I received my Generations Astro Magnum on Wednesday precisely because that's the Shockwave toy I bought for myself from my newsagent for $20. I always thought it was a knock-off, until I finally read about it being the original toy some time in the past 20 years
I would be quite happy for late-G1/G1.5/G2 toys to be given priority for the next few years, and for there not to be any more early-G1 toys in that period if they've received a deluxe and up in the past 7 or so.