False Vacuum Decay in Two-Higgs-Doublet Models Plus a Scalar or Pseudoscalar