Goldstone theorem and diquark confinement beyond rainbow-ladder approximation