Models for household portfolios and life-cycle allocations in the presence of labour income and longevity risk