Thought I'd post a quick update.
The firmware appears to have completely remedied any battery life issues... I've been running 10 days now with essentially no drop in the battery voltage for a switch that is opened and closed a few dozen times daily. Success there.
On the other hand, I attempted to apply the same firmware to two other sensors and ran into the same issue where the upload failed a couple hundred lines in and left the XRF in boot loader mode which I was able to recover using the XCM tool. On the third switch, I attempted the upload from the XCM tool directly, and actually ended up even closer to 'bricked' status. I was forced to pull it back to boot loader mode by typing a '~' within 150 ms of power up (not easy).
So, if there is a bug to report thus far, it is on the installation only, and it seems to happen with some consistency (3/3 at least) across two methods of upload (miniterm.py and XCM) No further issues after that.