I made up a little chart to send the guy with the astromech site to try and show what I've been awkwardly trying to explain in writing. It took a couple of days and false starts to make with Gimp for Mac (I'm pretty weak in the photoshop skills). I'm posting it here to see if anyone notices something I should fix. I included each of the hero and pyro models that had droids (including the 5th hero model mentioned in the Famous Spaceships article). I left off the rough pyros and Y-pyros because they seemed to lack astromechs (although it seems at least one pyro X-Wing had a primered and glued R2 from the pic of that part). To the left I included the astromech the model seemed to end up with by the end of filming, and put the images of other astromech models that have shown up in pictures (Red Leader being the leader in most astromechs). To the right of the model is the full size droid prop where available (sorry about R2-D2, I couldn't find a cap of him on the full size X-Wing). I put the black R2 dome with Gold Leader since that is the astromech it sports in the film and today, and put R2-X2 next to Red 10 since that's where the EU places him, which is why I have the question marks on those. The Red 3 pyro pics are long gone from the RPF and after many hours of creative googling have not turned them up on the inter-webs, I had to use the pictures of pictures on a computer screen to represent Red 3 pyro. The arrows I drew in to represent which ship the droid probably started out in and then ended up in. The gray dome R2 on Gold Leader and the shot of Gold 2 with a gray dome R2 is probably the most speculative of these, but I couldn't quite fit a question mark on it. Here's the present state of it: