R5-D4 was definitely the ideal for the Y-Wing... You couldn't put R2 in there obviously, so R5 it is.
I still can't get over the time it took to get a decent R5-D4 figure in the modern line. Probably one of the funnier things in the line's history. I am ok with R5 as he is too, but there's part of me wouldn't mind seeing even the BAD body re-used to give us a new spiffier R5... Hey, I'd buy it. *shrugs*
I removable "bad motivator" popping out of his head would be cool, as would a removable restraining bolt accessory, but either way I'm also not going to shed a tear if they NEVER make a new one. This is one that's cool to me, but almost more a set-piece for the Jawas than a figure I care much about. And with BAD I'm probably even less likely to ever really demand a new R5.
Still... like I said... I'd buy one if they did it using one of the superior figure bases they have available now.

My vintage figure was without a body for a long, long time... for some reason his sticker was lost long before R2's.