I'd move the switches and remote tracks to the S and keep the VW for trains.
On my layout a ZW powers the trains while a Type Z handles the lights, operating accessories, and remote control tracks. I'd always recommend have the trains power source separate from the accessory power source.