It’s a fine kit. You should however check if there is any underwater body that will accommodate Tamron 17-50.
In this set, you might miss WA zoom or prime. Tokina 11-16 or Sigma 10-20 as originally proposed. WA lens will be useful for landscape and architecture.
You might also consider Nikkor 85/1.8 G AF-S as a main portrait lens.