Using these two tenses together still causes my students lots of problems. It took me ages to find a good activity to practise them that didn’t involve gap fills and was challenging enough for upper intermediate level students, but the search was worth it.
The one I found was taken from the Reward Upper Intermediate Resource Pack (Unit 3b). In the original task the students look at a set of twelve pictures of people. They choose one in secret and write a profile of the person, including information such as what they are wearing, what book they are reading at the moment and where they usually go on holiday. The other students then read the profiles and decide which picture they wrote about.
I adapted it slightly by giving the students two minutes to draw their own pictures instead of using the ones from the book. This personalised it and provided much laughter! This is what we came up with: