Ion concentration in acid and base
Your second (B) way of thinking is correct.  

In the solution there are twice as many OH- ions as H+ ions.  

All the H+ from HCL will react with half the OH- from calcium hydroxide.

Half the OH- will remain ($10^{-4} OH-).

Then use $K_w$ to determine the final concentration of H+.