Floored by the floor

Onto the floor now.  I look at the drain, can't see how the cover fits on water tight (one piece was oval one was square) and call the company.  They say it can only be used with their shower trays, no way I can use it now, any solution requires digging it all back up again.

Cue more frustration.

I order a new drain, and dig it all up.  It wasn't too bad, as I could leave the bulk of my cement in there, and just get enough pipe exposed to fit the new drain.  A bit of pipework and solvent cement, the new drain and location look like this:

 This should fit nicely butted up to the left hand side of the room, with the right hand side having a 15cm-ish box concealing the shower unit, butted right up to the edge of the drain.

You can see another waterproof socket there - that's for the shower unit power.