you can calibrate by tapping a bit over the lower points (about half a centimeter for me)
you may als be able to save a pointercal from a 2.1 firmware and restore it via ADB, then reboot. (did not try that)
I tried this and it does work but it never takes. I've been in calibration mode forever calibrating over and over it never says "calibrate success". Any ideas?