Keeping Vpp off other pins in PIC MCU
2.2k will still allow quite a bit of current to flow and could push up the power supply rail on the chip.

I suggest using an NPN BJT wired-or rather than a diode to force /MCLR low (reverse the output logic on B5). I'm not sure the clock is an issue- it's not high voltage.