They're definitely going to end up on opposite sides vis a vis the subject of war, and funnily enough, while Goro isn't unaware of the existence of shades of grey, he also doesn't care. Goro doesn't actually value human life much and wouldn't think twice about sacrificing large numbers of it to get his war. So I feel like there's no way these two won't be enemies, but he will definitely be caught off-guard by Diana being able to match or even exceed him in the strength department. XD