Sounds like you've got things pretty well covered. Don't forget to train in the specific events also, particularly swimming (open water if at all possible), as that is what is most-neglected for most of us weekend athletes. Also, the more core work, the better as everything originates from there.
Jim