That is correct, there are some 737's 3/4/5's around in which HDG SEL is engaged with TOGA. I agree it is a bit challenging to comply with the 400 ft - HDG SEL sop and I always brief this small difference, because I've seen so many CWS ROLL activations at 400'. which is no problem, but it creates unnecessary confusion sometimes.