The metal raceways themselves should be bonded to ground. With the neutral and grounds bonded in that non-service equipment panel, now you have neutral current on the raceways. Neutrals and grounds should only be bonded at the service equipment. Jerry Peck may have some comment regarding submarines...