I got a Suriname Passport with a Hong Kong Residence Permit and Temporary Hong Kong ID

I am a Suriname citizen and currently working and Hong Kong and have a temporary Hong Kong ID.
Prior to Hong Kong I lived and studied in Mainland China for 8 years, including Shenzhen.

Prior to moving to Hong Kong, I rented a storage facility in Shenzhen and stored some of my belongings, now I am planning a short trip to Shenzhen to collect and move my belongings to Hong Kong.

I would like to know if I can get a visa at the border (Visa on arrival) or should I get a normal tourist L type in Hong Kong?

Thanks