Not having a bench vice really made things a bit harder than I had anticipated. Anyhow i've swapped it out and reassembled, it seems to be all good though i've not tested thoroughly enough.
I have a suspicion the coolant isn't flowing as well as it should be, i'll look into it some more though.
