I designed something very similar to this about 10 years ago. It's an 8-bit PWM generator for use in a micro computer system I designed too.
It uses the 74HC590 counter which has a built in register which prevents the problem you are seeing. Plus, it has 16x the resolution.