Early-on with my C25 I found that partially roller-furling/reefing the 150% genoa did more harm than good in a blow. Then I discovered luff foam, installed it, and now the genny behaves Much better when I take it in a bit. Less bagginess = greater control.
Also, these days I'm quick to use the mainsail traveler. I know, it doesn't look like its paltry amount of travel will do much, but it does help keep the boat upright and the rudder acting more like a steering device than a trim tab or diving plane.
For the downwind run, do you have/use a whisker pole for the jib? Wing-and-wing is fun (and it feels a bit safer in shifty winds when the boom is fitted with a preventer).
Joe - s/v Assignment, Catalina 320