I had the exact same problem on an early 2015. I think I have fixed the issue with a good clean of the battery terminal. Sprayed a small amount of isopropyl alcohol into the connecter and pushed the connecter back in and out several times before allowing a good 10 mins to dry. So far, I've been using my MacBook as normal all evening! It's great to have it back!