Little late to add but sounds like you found the best game plan on this. FWIW I had our 2K Silverado painted (cab swap actually) at Hunters Paint and Body in Mesa and they have a glass guy come out to do theirs.
Like paint and body work dont use the lowest bidder ESPECIALLY on the re-install...
Chris