Charging port seems to be the best immediate solution, it's possible something you did or something that happened environmentally caused it to fail. Because you indicated there were issues before cleaning I would guess it's a failing port due to the debris build-up.
You could also consider a new battery replacement. I've seen instances where a battery won't accept a charge through the port but works wirelessly and it ended up being a defect in the manufacturing. Tristar is the other possibility, but seems you have a good read on that.