Please help with advice on my situation:

Arrived in Shanghai on tourist visa a few years ago. Registered at local police station, got the yellow piece of paper. Found a job, got a Z visa and the little green residence book.

Changed apartment while in the same job. CANT REMEMBER IF I WENT TO THE LOCAL POLICE STATION TO REGISTER.... seem to remember being given the advice that, since I had a Z visa and green book then I didnt need the yellow slip (the green book superceding any need for the yellow Temporary Residence form).

Changed job. Z visa ran out a month later. My company got me one of the new Z visas which also acts as a residence permit, and so the little green book is no longer required.

NOW.... changed apartment, tried to register with the local police station (within 24 hours), but they say that I need the yellow slip from my last apartment (where I didnt register because I had a Z visa and the little green book, as far as I remember).

ADVICE?!?!?

It seems that a residence permit (whether the little green book, or the kind that is combined with your visa and stuck in your passport) DOES NOT remove the need for a temporary residence permit (the yellow piece of paper)! I.E. you need both.

What kind of fcuked-up beuracracy is that??!?!