Yes that's looking better, it appears to have plenty of angle now, you may have got away with a little less, always hard to say, but just try it I think, see how it goes. Perhaps take a few bits and pieces with you so you can fine tune it when you get to your destination. Would you be able to fit the spray deflector where you are going if you take all the bits you need to fit it. I can understand your reluctance to fit it untill you have checked the general performance.
Anyway the weather is crap for sure but you just need to give it a run in some sheltered water somewhere. I would be trying to or be prepared at least to do some adjustment while away.