I believe that R0-4LO is Jessica Pava's astromech.
From what you're saying, both R5-X3 and R0-4LO go with the TFA figures... that's where I'll put them.