>> they all came in as POP this time...

I was not expecting that.

Are they all using the same, original PST file? i.e. You only have one top level folder and they are all under that folder?

Do you still have all of your original Contacts and Calendar events?