I was not at all impressed with the company you had move the water heater.
Details were not explained like the drainage system for the sump pumps.
He didn't know the details of the radon system that necessitated a change in what we wanted done with the water system.
They were very nice. The seam along the new concrete looked fine when wet, but dried rough and unfinished looking.
In our bomb shelter I don't know if they put up plastic, but everything was COVERED with concrete dust. It took us extra time putting things away because we had to clean them and the room first.
We had a bad experience with another company and your system seemed to make more sense than others.