I know you have signed up and all that but is Cabos the right race? Why not Texas? A few reasons I see

1. Cabos - despite the change in bike course - will probably be pretty tough if it is windy again and given your bike is not your best of the 3 disciplines, I am afraid it will leave you too far behind the strong swimmers and bikers to catch up or you will be too worn out to leverage your run strength

2. I think a lot of people will suffer on the run in Texas due to heat and with a relatively flat and fast bike course you might loose less on the bike and be able to leverage your strong run to the max.

3. 2 more months to train

On the other side, the swim in Cabos is easier than Texas - but it is a smallest part of the race so I would choose race based on run and bike