#1 is still a little broad, but at least it's less broad (and also on a +2 approach instead of a +3, so you'll be putting down +4 rolls instead of +5 rolls even more often); I rather like that one as a good way to keep the spirit of it without being too overwhelming.