Depends which is easier on your boat, playing the traveler or the mainsheet. Upwind overpowered and underweight, flatten the main using tight outhaul, vang, cunningham and backstay. Personally I would sheet in and and play the traveler first to control the heel. If the traveler at or near the bottom of track is not enough, 'vang sheet' by playing the mainsheet. Once you are in that mode you'll probably want to pull the traveler back up to the middle so you can use the cleat more easily. Be careful to avoid inverting the mainsail with too much backstay. You can tell when this happens by the windward bubble in the center of the sail. After all of the above, if you are still overpowered and don't want to change headsails, ease the jib sheet and move the car aft to open up the top of the sail. Much easier to feather in the puffs with a #3 than a #1 which can lead to the dreaded 'auto-tack'.
