1. Yes, that's what I wanted to point out. Many people don't know the destinction, and can get hit even though "they are shopping on Amazon".
2. Even if it is non-FBA it should be in the interest of Amazon to have stronger enforcement for non-FBA sellers that are consistently lying about their delivery dates in order to get a sale. That should be pretty easy to track. In the past the variance of delivery dates hasn't been that bad, even for non-FBA sellers.