I would -

Add a 10uF tantalum cap very near the PIC between Vdd and GND. I would also lower the pull-up on MCLR to 4.7K.