Gridcoin Github: Forking due to beacon checks

tomasbrod has posted a new issue on the Gridcoin Github which is a continuation of a previously posted issue from a few days ago:

"I came to conclusion that most forks after the v9hardfork were caused by false detection of bad beacon contracts. If a beacon contract within a block is detected as bad, the block is rejected.
The validation of beacons is, I believe, correct, but it operates on inconsistent data.
When reorganizing, the "Admin Messages", where contracts are stored, are incorrectly reloaded. This causes messages included on a fork, persist in memory structures even after that block was removed during a reorganize. Connecting blocks will fail, because the wallet now thinks the contract is duplicate. The client will get stuck on the block, starting yet another chain fork." - tomasbrod on Github

My question is, are the current forking issues attributed solely to the use of the reorganize command? Should we simply refrain from using it until the next release and instead try to rebuild the complete block chain using Rebuild Block Chain in the wallet if we find ourselves on a fork?

Should we also consider the possibility of removing the reorganize command (temporarily) if this is currently the main issue behind causing new forks?

Thanks to anyone who can share some insight.