You are correct about everything.
Since you are using 16oz masterbatch which is 8 oz lye plus 8 oz liquid, you then just subtract 8oz liquid from your liquids used.
You said you use about 18 oz so then you just subtract the 8 oz from that which gives you about 10 oz.
Hope that's clear...