One other thing that occurred to me is that if you have a Diners Club card, hang onto it.
The extremely generous SPG>WN transfer option quickly noted in this forum after the announcement of 2.0 is certainly IMO at risk of devaluation. Not sure I'd put all my eggs in that basket.
Diners may fly under the radar, especially since they aren't taking new applicants.