Shanghai Buzz is theoretically better but needs more targets - personally I think the DL version that feels very lower-brow arcadeish but with better targets and guns than WDW is about the right mix.
Since the SM overlays are better than the core ride, I'd hope they'd leave the queue generic enough to still rotate through them - can't have Buzz Lightyear fighting TIE fighters.
Meanwhile, this is just weird:
Buzz Lightyear, as he is depicted in "Lightyear," is now greeting guests in Tomorrowland at Disneyland Park.
wdwnt.com