Update EMR model customizations

* Readjust retry logic
* Add waiter for ClusterRunning

cc @danielgtaylor