Is the choke wound with fairly thin wire? It would be unusual for a CM choke to have all its windings shorted together unless it got very hot from fault current or adjacent heat sources, or by serious over-voltage between the windings. I'd recommend leaving out the choke and just jumping the lines until the cause is figured out. Rewinding or replacing the choke later should be fairly easy.
Ed
