We show that simple Two Higgs Doublet models still provide a viable explanation for the matter-antimatter asymmetry of the Universe via electroweak baryogenesis, even after taking into account the recent order-of-magnitude improvement on the electron-EDM experimental bound by the ACME Collaboration. Moreover we show that, in the region of parameter space where baryogenesis is possible, the gravitational wave spectrum generated at the end of the electroweak phase transition is within the sensitivity reach of the future space-based interferometer LISA.