I like what you've committed to github. Back on target for 2 minute blocks and 4 block retargets. That with the 4 block lookback for retargeting should help with getting difficulty stuck.
Yeah I backed up a little on the merge, just so I can get the sync issue fix first and then will set a date for the hark fork so everyone has enough time to upgrade.
The sync fix will be in the next upgrade version 1.3 and then after a set period of time version 1.4 with the hard fork will be released.
Petr1fied should get the credit for this fixes, some great work from him and he has help the coin loads with these essential fixes.
It will also help my efforts to get Extremecoin onto some decent services.