Good girl, Deena! My calculator uses trig, also. On approach shots I measure my lateral component with flagsticks.
Lizard, when I said 10% more, I meant 0.77 for 0.7. 'Twas a very ambiguous statement.
Interestingly enough (well, probably not to anyone but me) I tried to make my wind table from my own trajectory calculator (carry only). It works perfectly for my clubs and balls with no wind, but the wind part is not right. I don't know if I messed up that part of the formula, or WGT did ;-). At any rate, I developed what I have from trial and error in practice rounds and a LOT of CTTHs. I know it's not spot on, yet. It takes a lot of shots to cancel out the deviation from precision/forgiveness. The gust thing makes it a lot tougher.
My calculator is on my swing ruler and works in 30 degree increments.