Yoshi has hinted heavily in the past that the Magitek Armor you get from the end of the 2.0 vanilla storyline will end up being a companion option. As for when that will happen, I have no idea.