Mast rotation is not a biggy, since it is almost round (not tear drop shaped). Of course, it should be rotated. But, in sail designing we have treated the mast as a fixed stick, building the main draft in the sail farther aft than you would with a high-tech boat with a wing-type mast.

Downhaul to get the wrinkles out and then some more. I actually downhaul hard even in light air with my sails -- I am using the Calvert Color-Load design which we have found to be very fast.

Sheeting upwind is an artform in itself. Here is a good way to find a good slot. With the boat at 45 degrees to the wind on shore, downhaul applied, sheet in from directly behind the boat.
Eyeball and line up the sheet block and the mast base. Then sheet in until the leech of the sail lines up with the mast vertically. Now, that is too tight. So, ease the sheet off until the leech is a bit off the mast.
Cleat the sheet and go mark the Sheet with non-washable ink. I mark the sheet between the upper and lower block in the front.
That is my starting point. If the wind puffs, I sheet in a bit more. If it lightens up, I ease it a bit. But, I use that mark as my base.
This is really handy after any maneuver, i.e., tack, start or mark rounding. While most are in and out looking for the sweet spot, I already know where mine is.

Hope this helps,
Rick