OK, I fixed it.
This is what I did.
I downloaded a free partition tool here: http://www.disk-partition.com/partition-assistant-lite.html
I used this tool to shrink the partitions (as Windows shrink wouldn't work) then used the windows disk manager to resize and all now looks correct. Its has remapped the partition table correctly.
Hope this helps anyone with the same issues.