My reasons for the change are both of those that you mention! I suppose I have by now resigned myself to getting aftermarket wheels.
I am aiming for:
Front - 18 x 8 ET42
Rear - 18 x 9 ET45
I believe these will clear the brakes with 355mm discs.