All credit goes to Anonymous for raws (#911152) and subanons for subs (#911742).
All I did was modify the typesetting of the subs slightly (so that titles/locations did not overlap with the kanji or get cut off the sides), as well as fix one typo, and mux it with the raws.
This is the first time I've ever done any sort of typesetting so it's not great, I didn't have a consistent margin when modifying, and anything that didn't overlap/get cut off I didn't touch (so those will probably be aligned differently then the ones I modified.
DDL of modified subs available here for those who already have the remux: https://mega.nz/#!x9MlCa6Q!f331Vlm1I8b-5FE-kuO4XPNmkJwonAZwI_EbcBYlSQw