Gxp and shimano are both 24mm axles but the interface with the bearings/seals is different.how did you figure which BB when there's no mention of the crank on their website? Again way too many choices gives headaches. Do you remember the exact model of your BB? Just want to see how to read the website details better.
If you want to run either on that frame, you need the pf30 to shimano or gxp conversion B.B.
However, is this the Atlas or the Hyas? On their website, both of those models at PF86. So unless you have different info, PF86 is what you need.
Per Bike Radar for PF86:
Very closely related to Trek's BB90/95 system is the PF86/92 standard used by Scott, Giant, Pivot, and many others.
- Crank designs that will fit: Standard 24mm external-type, BB386 EVO