I do the same.
I keep a spare in the charger and swap when required.
I have two of the batteries...it’s a must on the road or on international flights...one less thing to keep charged...
Still I’m thinking of upgrading but not sure to what...I have my DX90 with Rockboxed and tweaked much that I don’t think I’ll be able to replicate the sound with a high end reference player...