A New Look at the Y Tetraquarks and Ω c Baryons in the Diquark Model