Just a thought, since you're using an 8-pin PIC, look at the PIC16F18313. It offers a bunch of features and is probably cheaper than what you're using (unless you have a couple hundred on the shelf already). It can clock up to 32 MHz internally.