do you use a change table? If you don't, even just get a change table mattress (one with the sides a bit higher than where they actually lie). DD is pretty good usually, but I find when I visit my parents and have to change her on the bed/floor it is a nightmare because she'll just roll over and crawl away..the sides on the change table mat, while they might not stop her completely may at least slow her down a bit!
Are there any songs that she loves? If DD starts getting upset I sing 'Hot Potato' which she loves, or Rock a bye your bear, and other silly little songs. But she isn't as bad as your DD so don't know if that will distract her enough..