another idea to fix the nrepl-buffer-ns problem

This one is less intrusive. Not sure what you are planning for 1.6, but this is a simple option.