Hey, If your GF did not personalize the phone much, I'd recommend going to B0.8.4 ROM
, all works perfect as far as I know (but it is Froyo as opposed from CM7 which is GB)
It feels almost like stock but it is faster with many advantages
My GF has it as well as I have switched to DS
As for the backup/restore, I'm sure you know can move a lot of things with apps like TitaniumBackup, MyBackup etc... I'd go that way
B0.8.4 suited me a lot as I wanted sense...
HTC One X
, maXXimus, Nokia X3-02.5 for work
Before: HTC Desire S
(my wife's now...), HTC Legend, Asus P750, SE W800i, SE K700i, SE T610i, Panasonic GD67, Ericsson T10...
" if your read anything helpfull, that's the least you can do
My BatteryMOD, BootAnim