"I'm probably not going to be doing any more work on the current history mechanism by adding in warnings or additional UI for it as it currently works, since I think any work in that area will be largely wasted when it does come time to do the big overhaul"

Completely understood. When you are a small shop....and I mean that as literal as 1 x 1...you have to mind your best use of time to the nth degree.