You should just submit the HKSAR passport application at the nearest Chinese embassy or consulate. Forms can be downloaded at the HK Immigration Department website. It should take about 2 months max so there is enough time. Then you can use your HKSAR passport to enter HK as a permanent resident, even if they don't update your HKID card.