If memory serves, the O2 sensor in the exhaust is pre-cat anyway is it not? I'm state-side so we don't get the Type R's but the headers on most of the motors I've swapped have all had the a bung for the O2 on them.
It sounds like you've got things well in hand so far with your general...