No, you're spot on DD.
NADP 2/ default/ ICAO type B- 1000/1000
NADP1- 3000/1000
ICAO type A 3000/1500
As per LIDO GEN TEXT. (The actual minimum height per the text is 800, modified by operator SOPs to 1000)
Other variations per CRAR for individual states.