Improved measurement of time-dependent CP asymmetries and the CP-odd fraction in the decay B-0 -> D*D+*(-)