I'm getting thoroughly confused now. Anyway, from what I've seen, it doesn't seem all that uncommon for the two-car unit parts of three-car sets (I'm doing it myself now) to run as standard two-car units.
158s are 2 car units as standard. They've split some of the sets though and added half of the split 158 to the 2 car standard set to create extra capacity