Personaly i hope we get both ...
1) At least one Origin character per class (im still not sure how do i feel about subclasses ... i mean Wyll make no sence as GOO ... but make another Warlock Origin character just so it fits to alternative subclass seems ridiculous)
2) Option to recruit non-Origin companions ... at least after Act 1, that would make sence storywise to me (presuming i presume right what will happen at Moonrise Towers ofc.
) ...
