LAX-HKG-SIN. HKG is a layover and not a stopover. On international itineraries, "A STOPOVER OCCURS WHEN THE PASSENGER DOES NOT DEPART AN INTERMEDIATE POINT WITHIN 24 HOURS."

On your way back, forget the upgrade from SIN-HKG. The flight is short of 4 hours.