Since you have a positive control that is working, I'd lean towards using assistant 2 to reflash the firmware on your drone and rc2 and then reset all your settings.
Since batteries are consumables and the future is uncertain, I've picked up a some extras for a few of my drones. For longevity purposes do you think it would be better to just include them in the current rotation so that I end up with even usage...