If you are not going to do any OD racing, I would recommend upsizing your main roach. I went Code 6, and almost regret not going even bigger. I have a UK Powerhead dacron with two full battens up top and I could not be happier with the performance gains and the immediate impact of fine tuning the shape on boat speed.
The bigger main shifts the wind ranges of your headsails and actually brings the #2 in to play much more. This spreads the wear to all three sails, and actually allowed me to reduce my #1 to 155 which improves tacking speed.
The extra sail area on the main also adds canvas for the downwind which is very helpful. So in the end, I have the same rating, more downwind sail area (which is the J/30s weaker skill) and the same speed upwind.
