The reason I suggested repressing is sometimes (depending on the tool used, remember there are cheaper tools out there than the Viega OEM stuff) the users don't get a full press and release early.
And no I don't use ProPress on a regular basis, but we have used it in the past, and don't use it presently on a company basis.
Personally, at home I use SharkBites.
Soldering a fitting on (as Greenman said) is the best option.
If the city shutoff leaks, complain and have it fixed, it's their responsibility to fix it.
There is no earthly reason to replace Sch40 with Sch80 in this instance. 80 is thicker wall, higher pressure rating, and slightly different chemical resistance, none of which you need here.
And with the proper glue, PVC can be glued with some water leakage running through it, as long as you don't allow it to build pressure until the glue has cured.