Since no one came to my help (unfortunately), I have doctored Pre 2 from 2.0.0. Why? 2.1.0 contains a bug whereby the HP Apps Catalog is not the entirely the correct version as after doctoring it, my Pre 2 is asked to download the HP Apps Catalog as it was using Palm logo.
After thinking through, I put it back to 2.0.0. Created a new profile as my original (plus others created for this experiment) didn't work. Then sign-in with the new profile and it works. HP Apps Catalog is working once again. The only issue is my backup is not working. Anyway, will leave it for now until Pre 3 arrives in New Zealand.