I forgot to mention that the problem is intermittent - maybe once every three or four times I shut the vehicle off for either problem. Could it still be the things you mentioned?

I won't have a chance to take apart the dash until this weekend, but thanks for the advice, I'll update on what I find.