How to fix a black screen (bricked) after rooting an encrypted device
I ended up flashing the Stock ROM (using sammobile.com) back again and using the Stock Recovery to do a factory reset as the Team Win Recovery format didn't do anything.
That did the trick, but of course all data is gone too. Oh well.