Mouse droids bugged

[DefinitelyNotRuby]

One of the last things I decided to do to get 100% completion was destroy the 20 helmet-wearing mouse droids throughout the galaxy. However, I came to the realization that two of them were bugged. These were the ones that were supposed to be around the mos eisley building that contains a combination code minigame and around the wreckage on jakku with a jumping puzzle.
Upon realizing that I wasn't making any progress finding them after searching those areas for probably far too long, I went to go get the remaining minikits in the last few levels, only to find that the quest tracker for Mouse Droid Hunt was still active within the mission. furthermore, it had reset from 18/20 back to 0/20.
I got out of the mission but the counter was still at 0. I looked up some solutions to the missing droid problem from earlier and found that they supposedly are actually at the other location on each planet. So I go there and sure enough, a mouse droid is in each. Upon defeating it, though, my quest tracker goes only up to 2/20. Furthermore, all the ones I had killed previously DID NOT come back after the challenge was reset. And thus, I am left unable to complete my last challenge.
know the game is pretty buggy, but nothing had blocked my progression for more than 5 minutes without fixing itself or being solved with a reload/relaunch. Anyone got a solution for this?
I suppose I could make a new save file and speedrun the story and then find and kill them all, but I'd like to save myself the trouble of an entire playthrough if possible, even if I don't get any other collectables.

[DigbethKid]

I'm so worried about bugs like this. I've got a captial ship that can't be boarded to take over because my game crashed during my first encounter with it. Now it spawns out in space, already damaged but no option to board. I do not want to start a new file.

[Stein Bagger]

I had the same problem with the mouse droid on jakku but it was just at the other jakku location.