Stop in for a cup of coffee

Just going to toss this out there. After rereading your original post, I personally would double check for a vacuum leak somewhere.
That is on my list for tonight. Vacuum leaks, manifold vacuum for vacuum advance and/or a bump in initial timing. All easy things to do. Thanks!