Adding USB Power Switch to Existing PCB Design

We have an existing load controller design PCB, that contains a RPi Compute Module that connects to WiFi and Cellular USB dongles, and also controls relays to switch external loads on and off. We need to add a Dual Port USB Power Switch onto the board, so that we can independently shut the power off to each USB Port in order to power cycle the WiFi and Cellular dongles. This allows us to recover from lockups on the dongles. We currently have a daughter board that controls this, but we need to move this functionality down onto the main board, to make the solution cleaner and take up less space in the enclosure. We are currently using the LM3526 usb power controller. [login to view URL] There are some other small tweaks that we want to carry out on the board: - Replace transistors on the board with SMD packaged transistors - Move a high power trace so that there is enough spacing between the two input 240vac traces to make it UL compliant - Replace a power SMD LED with a different one which has easy availability (the one currently specced has a really long lead time, and is expensive)