Update 2G unlocked iphone from 2.2.1. to 3.0.?

I want to update my 2G unlocked iphone from 2.2.1. to 3.0. What's the best way to keep it unlocked and update it? I can't remember if I used Pwge tool on the mac or Quickpwn on the PC so how should I update with least problems?