You could shift it to the beginning of the film and just have him moaning about sand.

You could have lots of shots of sand, from films like Lawrence of Arabia, Dune, Star Wars etc and then shots of people making sandcastles on sandy beaches, carpenters using sand paper, while the song Sandy from Grease played in the background intercut with Anakin rolling around in the way that he does mumbling "sand....It gets everywhere...rough....the sand is the sand... sand I HATE YOU!".

This could all speed up until he wakes up with a start.