Try just loading the 1.5 dump directly into the 2.0 database without the filtering step. It will be immensely noisy with lots of errors and warnings, but with luck you should find your data is there waiting for you when it's done.
I don't have problems with data. Everything is in place. After droping those 4 tables that happened to be views, and recreating views everything seems ok (till next dump/restore).
