Divorce is too important an issue to leave to self-help. I strongly advise you to contact an experienced matrimonial attorney-mediator in your area who is familiar with the matrimonial courts in your jurisdiction to help you. These matters must be handled appropriately from a legal perspective to make sure that the issues involved will not come back to haunt you later on in life.
From your brief discussion above, it sounds like you worked out many of the issues involved, and it should not take much legal time for your attorney-mediator to prepare the necessary papers.
Leonard M. Weiner, Esq./Divorce Solutions