We'll definitely fix the double notifications (and flaky notifications in general) sometime soon.
As for the number in the badge, we're trying to match people's expectations on this. Most people will be used to iMessages/WhatsApp or other messaging apps, and I believe all increase the badge count per message and not per thread, right?