The normal way to quench is usually addition of water but the problem you note is that the product is soluble in water. But how are you going to remove the DMF?
If you are just going to evaporate off the DMF, you can remove water by the same method without extraction, and just purify the product by chromatograph or other methods.