For r type I think that frame counting is the only thing I can do at this point. Although your last suggestion looks a lot better.
As for the waterfall, yeah bgmapper rips it fine, but after that there's a lot of things you could do. When you run into funny transparencies would you rather attempt to duplicate them to the best of your ability, or simplify them to make your map look more like a map and less like a photograph?