yea you would get 20 ml but you have to add it to 20 ml of existing NaOH, so its 40 (20+20=40)
As for the first part, thats how ppl have been doing it lately, but i use my own method, the 2nd method i use because as it threw you off it threw me off as well when i did it also, most ppl do it the second way...its easier to understand but the calculations may be hard towards the end if you have weird numbers...