After a firmware update, factory reset on all devices and not using load balancing but using routing policy to specify which devices use which WAN connection I seem to have it working OK.

Thanks for your replies.