I'd kick Brocade in the shin to see if they would fix their issue, but I'm all ears if you have a suggestion for a workaround at the NMS level :)
Is it possible to have a manual/GUI way to set the connections, once set manually, the automatic updating would leave it along, if cdp/lldp finds discrepancy, warn about the inconsistency.
Thanks!