That panda app is great, thanks for that. I worked out how to change to English (clicking on the phone on the top left and selecting it from there in the submenu) and also to enable usb debugging (every time) to connect. Some really neat functions in that app that are lacking in the HTC sync software.
Anyway, I realised it was actually quite simple and deleted all my contacts using an android app and also deleted my google calendar to clear the calendar (and make it offline). I then used the 'Transfer Data' application which worked once I had deleted the pairing from my N95 and it successfully transferred all the contacts and calendar to the HTC in the My Phonebook and My Calendar.
The calendar sync didn't work that well though, there are some inconsistencies as it continued a recurring event that was cancelled a year or so ago and there was a crossover for one day events into the next day (1am - 1am). I'm wondering if that might be a time zone problem...
Anyway, for the notes I did Mark All on the N95 and then send to e-mail so it sent all the notes as text files in an e-mail. I used Wifi for this bit as the N95 was working without the sim card. I then copied all the notes in text format to a folder on the memory card in the HTC and then used an app to import them all. I tried AK Notepad initially but it didn't import them very well, the words were really spaced out and interlaced with odd characters. I then tried Note Everything and that imported them perfectly.
I now need to correct the calendar issues (may try a sync with panda app and see how that does) and migrate the To Do list across (only about 10 things). I'm trying out different To Do list type apps as on the N95 I had them shown on the front page so I didn't forget to do them...