my view is that, in the future, most people will be elements of bigger people, making this division difficult.

I think the idea is to divide between current people('s individual extrapolated goal systems) once and for all time, in which case this poses no problem as long as personal identity isn't significantly blurred between now and FAI.