Recommended layover time in CAN for Los Angeles to Kunming

I will be arriving in Guangzhou at 7:00 PM from the USA and connecting to Kunming (all on Chinese Southern). How much time do I need to transfer, with customs, immigration, baggage checks, etc.? I have the choice of a 1 hour 30 minute transfer or a two hour 30 minute transfer.