Does Hijikata still frequent Riou's old camp at all? I think you said he moved to the old man's house near the pure of heart bridge, but I can't remember what happened to the camp lol.

If he does still use it tho, that might be a great place for Rei and Hijikata to connect beyond their current transactional relationship!! Since it's out of the way (and still booby trapped????) maybe Hijikata makes Rei meet him there for the phone upgrades thinking it'd make him suffer a little (lol) and they can go from there?