You could try to restore 2.1 rom and flash 2.51 odr 2.21 bootonly.That won't work since defy recovery can't backup/restore kernel (boot.img) due to signature checks, am i wrong?
We should work on openrecovery it should replace boot.img with signature