I've went and installed the latest Marshmallow BTU version on my EE-locked S6 and it's working like a dream. No rooting, Knox-tripped or warranty voided.
Finally, received today on the Samsung Edge plus. Just as Nougat released. My Nvidia tablet 3 years old received 9 months ago. Will be dropping Samsung and EE in the future.