Improved measurement of CP asymmetries in B0 -> (c c-bar) K0(*) decays