Christian, you really can't go wrong with the 996 imo. Great solid, stable and well built cars, a little pricey on the maintenance front. My experience with them mostly comes from relatives and friends owning them.
Considered adding to your car collection rather than letting go the Z - You have a really clean one and who knows where the current gen would be in a few years...
little motivation shot