Giovanni

I think Giovanni was more entertaining as a villain, but Dietrich was more cunning and double-handed.