windows 7 and windows 2000/2003 have a different naming conventions for the profile. windows 7 uses te username.V2 while the others use username.
You need two roaming profiles. One that is for terminal servers and one for the desktops.
What you need to do is setup a pair of shares where one will serve/store the terminal server profiles and one that will handle the workstation profiles.
The use of folder redirection will handle the equal access to the files that are on the desktop, my documents, start menu and will maintain application level settings through appdata (applicatio data). You would need another share that will handle the redirected folders.
You may want to setup the folder redirection first to allow the laptop to transition copy the data to the redirected folder share.You would need to merge/copy the terminal server data (desktop/my documents) as well.
You would then need to copy the local profile from the latop to the share for workstation/laptop profiles. and similarly for the terminal servers share of profiles. (properties of computer/my computer).
Once you have done that, you would adjust the configuration on the AD account profiles and terminal server tabs respectively.
The next time you login into a workstation or terminal server the respective roaming profile will be retrieved and with folder redirection you will be able to access the same synchronized files on the desktop and in my documents.