They were both stuck on the problem block last time I checked, but tonight they are both showing the correct block and have updated to the new wallet.  I suspect when you posted this only one had updated - but right now - both are fine and are on the correct chain. 

To my knowledge, the only other chain out there is the one from before the new wallet that is stuck.  The new wallet solved that problem and moved us forward.