Surely a condescending German machine and a sneaky Japanese one will have no problem getting along. ;D
Seriously, hope you get to a point where you have them side by side. Pretty sure you made the right call by keeping the Z. Best of luck... and stay safe over there!