Your problem might be due to garbage in garbage out syndrome. How much signal conditioning do you have? Are noise spikes causing you to count extra?

Most probably you will need to clean up your input signal with a single shot(s) (74LS123) and a D type flip flop(s) (74LS74) would help also.

With a clean signal then all of your software would work as it's supposed to.

Charles Bannister