Both probably more likely, but if I'm gonna WISHlist, I'm gonna wish HARD.
Cortez would expressly have alt pieces for Senyaka, Chrome, and Milan while Voght would come with parts for Cargill, Scanner, and Unuscione. Colossus would have Katu, Delgado, and Kleinstock parts. Beyond that, of course, you could make a handful of the more generic looking Acolytes with spare parts, like Vindaloo and Neophyte