Pasport renewal upon h1b case approval


I have a Passport validity till October 2017.My H1b case recently approved. .Before moving to H1b stamping, i want to go for passport validity extension .Can you suggest best idea between these 2 :

  1. Can I go for Passport renewal before H1B stamping? or

  2. Can I go for Passport renewal after H1B stamping?


If I were you I would get the passport renewed first and then appear for stamping. This way the visa stamp would be in the latest passport and not the old one.