This is starting to sound like a Version Control type solution where you just update your Wikipedia every now and then and it merges the new info.
Zim reader was the best I could do, and still is the best at the moment. But I would be totally fine with dedicating a few terabytes to keeping much more complete local archives on my file-server if the update process was reasonably automatic (something like bittorrent would be great).
Zim is a desktop wiki app.