In talking with Hujoe Bigs, I have actually found more evidence to suggest that an errata of sorts would be needed. For instance, ever since PtL had been released in the game it seems most effects that would take place at the same time as another effect seem to be governed over by the "immediate" wording, effectively removing your choice between which effect should happen first. Because of this, it seems to point towards a common thread, that cards like R2-D2 and PtL only need a slight change to clear up confusion.
No large rule change would be necessary, just a slight errata in an FAQ update.