Yes. WAAS is for the LPV, as the SBAS is where LPV sources its vertical guidance information from. Whereas VNAV in LNAV/VNAV sources its vertical guidance from Baro altitude. Hence the note on the approach plates that have LNAV/VNAV regarding extreme temps and compensated systems.I teach it both ways. But I am curious as to where WAAS comes into play. If one can shoot an approach down to LNAV mins without WAAS, certainly one can navigate to the VOR and do the procedure turn without WAAS as well, before switching to green needles.
DPE says it is in the IFH. I cannot find any reference to WAAS in there.