It might still be worth thinking about moving osm2pgsql for a future import, but best to get everything working first the way it is.
It's more important to think about where the diff-import should be running from. I'd suggest trying it from willow but keep thinking about maybe shifting it to ptolemy..
Peter