I'd at least wait until the 18th to see what Apple is about to announce. Even if you don't get whatever they announce, it might be good to view your options in light of the new products.
Agreed, but I don't have my hopes up. Their keyboards have been atrocious for the last few years. Everything in their current lineup has the stuck-by-dust-particle problem.
Anecdata but: I bought the 16" MBP when it was first released and have never had a problem with it (or with any of the work-issued MBPs I've been issued in the interim as well). I had a butterfly-keyboard MBP from work for a couple years and while I didn't like the feel of the keyboard (I'm happy with the post-butterfly MBPs' keyboards), I never had the dust particle issue with it.