Craigster,
I just read the thread from the link you provided. I don't know whats happening with your marring problem or loss of slickness. Could be many things causing this.
As far as what to top with, it sounds like you really like NXT. Why not use that. It has cleaners in it from what I hear (never used it) and it might remove some or all of the UPP.