Just to update...

The RockAuto gasket in-fact came with the square seal...

Although, in the process of removing the solenoids, I broke every one of the damn clips...

I will be searching "how tos" on what others have done in this scenario...

I was as gentle as I could be...

FS section here I come...