I wondered whether it would be possible just to add a fixed fuzz to every row estimate, say five rows. It would essentially mean you can never get this issue of a small undercount causing a plan disaster. Overestimating slightly is basically never a big issue as far as I know.
(I should perhaps have considered this when I was actually making a query planner in a previous life, but there were more than enough other things to worry about :-) )