If you install a solid boom vang (Garhauer Marine Rigid Boom Vang RV 20-1SL is what I installed on a Hunter 31) then you will not need a topping lift and that will allow you to install a larger roach main.
UK Halsey (located in Grand Marina), Pineapple, Doyle, Lee Sails and other lofts are located in Alameda. UK designs it locally and has it sewn in Chicago. Doyle and Pineapple sew it in Alameda. Consider Hunterowners (uses Doyle loft out of Florida I understand) and North (north has a SF loft). There are also many other sail lofts in the SF bay. All recommended to increase sail weight 1 ounce higher than Challenger's recommendation for SF summer winds. I purchased an 8.3 ounce, Challenge high modulus dacron with 2 + 2 battens, maximum roach, 2 reefs, Cunningham, and loose foot on my Hunter 31 last December.
As far as the jib the local sail makers recommended 110% for summer and 150% for winter. I also purchased a 110% head sail at the time since I already had a 150%. It is also a 8.3 oz, Challenge high modulus dacron with UV protector, luff flattener and designed to maximize sail area close to the deck as the sail supplier could design for given the head sail is mounted to a furler. The turnaround time was 3 weeks.
The new sails were tested during several very high wind days in January in the bay and out the gate and I am very pleased with their performance.
Suggest checking the web site for Challenger and other sail cloth manufactures sail cloth, sail lofts above and talking to the local Alameda sail lofts. Inquire about how to maximize the sail size, what material and weight, sail design features and full or partial battens that meets your needs and price. If you are confident about taking the measurements yourself then purchasing sails from Hunterowners and other lofts outside the area is an option. Plan on a new main sail cover since the new sails will be larger. Winter prices will be lower and turnaround time will be faster than summer.