I'd agree with previous comments (including my own initial comments) about practising in different ways to improve the ability to deal with different attack types.
Also, I do most of the aikido training to deal with the 'average' street attack - which to me usually involves someone who doesn't leap around, but does try to use strength (rather than efficient use of their body) to attack.
However, its good getting an insight into other reactions people have (e.g. we used to have weekends where different martial arts would train together). Also, one of the hardest people to demonstrate with is very good at relaxing their shoulders (done Kung Fu previously), making some techniques more difficult.