I swapped my stock 16" for some method 17". If I had it to do over, I dont know that I would make the swap. Tire choices are the same unless you're going to 37", where the are more choices for 17".
Factory wheels are good and can be freshened up. IMO, keep the 16" wheels, get a 2" OME lift and...