I agree that self custody is the better term, I always mention this when it comes up.

I usually say "bank custody" for the other one, but delegated custody works too.

The point is, someone always has custody. So "non custodial" is just stupid.