Move neutrals to subpanel or leave them on main?
I think that is covered in NEC 300.3(B), All Conductors of the same circuit...shall be contained in  the same raceway, auxiliary gutter, cable tray...
The small portion of raceway where the neutral or hot nipples between panels would break the rule.