It's a tricky one, the NA is all moisture tolerant and a very good screed when applied correctly. Likewise Laminate floated on a underlay with DPM and tape does have an element of moisture tolerance to it as well.
'by the book' would be to take up what you can, re-dpm, NA properly all at quite...