Baryogenesis from a CP Violating Higgs Sector II