I could have answered my own question if I had found this in the ASOP earlier. I've been removing Prep Fire counters too early, at the end of the Prep Fire Phase. The ASOP specifically says to keep them on. See below.
5.3 END OF AFPh:
5.31B Resolve Blaze Spread (B25.6; B25.651) every...