Try to change the outhaul... more tension should result in a flatter profile, especially in the first 1/3 of the main. This might help with the telltail (not sure).
Too much mast rake could result in a situation where you sheet in block to block but have not sheeted in tight. The first 1/3 of the main would be effected the most. Less mast rake might help with the trim of the main - it will help a lot reducing weather helm.

Patrick