Arghhhhhhhhhhhhhh 
Upgraded my Touch firmware last night to v2.2, had to do this at home due to firewall issues at work but basically all my music is on ITunes at work.
Came in this morning and plugged my ITouch in and firstly all my music was deleted by the upgrade, OK fair enough I can sync my music again, not a massive issue BUT I noticed that ITunes now thinks my Touch is an IPhone!
Worse still my capacity has gone bonkers and the 'Other' category now has 17GB used! This means I only have 8GB left for my music which doesn't make sense!
Only option appears to be to restore completely to the factory settings and lose everything?
Can anyone make any suggestions before I resort to this?

Upgraded my Touch firmware last night to v2.2, had to do this at home due to firewall issues at work but basically all my music is on ITunes at work.
Came in this morning and plugged my ITouch in and firstly all my music was deleted by the upgrade, OK fair enough I can sync my music again, not a massive issue BUT I noticed that ITunes now thinks my Touch is an IPhone!
Worse still my capacity has gone bonkers and the 'Other' category now has 17GB used! This means I only have 8GB left for my music which doesn't make sense!
Only option appears to be to restore completely to the factory settings and lose everything?
Can anyone make any suggestions before I resort to this?