Congrats and hope Klamath was fun!

Some lee helm may be "normal" simply because you're hoisting a huge amount of sail in front of the center of resistance.

You could try a little more mast rake. But you'll probably find that there's a balance between weather helm upwind and lee helm downwind.