For this type of scenario I have had to manually uncheck the Completion Activity Report. I have never seen the Activity uncheck when a student revisits a course activity, but my site Gradebook = always take the highest value. So maybe you should review you site Gradebook condition, will it take the "last" value or the "highest" value or some other option?
Kind regards
Kind regards