Make sure your Time Machine, and disk image backups are current before installing Lion. Then, you can restore using whichever method is the most current (I usually have a few hours between my last disk image and when I do the OS update/upgrade, so I always do one last Time Machine backup before beginning.)
I use the same methodology for both point updates and major upgrades.