Makita buffer clicking, sparking and burn smell, power loss upon immediate use

So I actually have 2 polishers doing this, 1 is standard makita buffer that I have had for about 4 years with daily use. The other Kustom shop buffer from TCP with only slight use. The makita has had one armature replaced due to burning brushes on one side, this was about 1.5years ago, almost a week ago I noticed it sparking again on and off but it now does it on both sides, burns both brushes a good deal, and as soon as I put any pressure to the buffing pad it slow down to a stop. I have swapped the communtator(big spindle thing) with another makita buffer as mine had a slightly raised piece like it was damaged and pryed up. It worked for a day but it has begun showing the same signs as before and I thoroughly cleaned out any and all hairs,dirt,debris when swapping. The clinking nay be from improper reassembly on my part. As for the KS buffer, like said minimal use and it's design is similar enough. The main thing with this one s the fact that it was in my old car which was flooded about 7-8 months ago. The fact it even works is great. I did test it out after I adequately dried on its own and it seemed fine so its been just sitting around, but with my makita in its current state I took out this KS buffer and it is showing the same signs with burning brushes, sparking and power loss, just no clicking on this one. Took this one apart as well and cleaned it, minus separating the case/armature and the communtator looked OK for the most part though it did have some rust on it. I would really like to save both these tools if possible.