Toshi is going to be an investigator, but proooobably with Oracle powers? I have to pick a domain for him, but the role fits his mentoring and his idealism-tempered-by-experience really well. He will probably be in a group of Bonded with Souji because they're attached at the hip.