Alan; I was in the process of looking to borrow a Z4000 or similar.
Engineer Joe; No I have not checked the routing of the wires in the tender. I down loaded the link you supplied and it looks very promising. I was about to disassemble the tender to check DCS / DCC switch. So I will soon know if the re-routing will work.
Thanks for your leads.
Charlie