I'd personally prefer simpler jobs and more complex fights. Once you get a job down, you're doing the exact same thing regardless of opponent, so they should shake up the opponents more.