Ok, maybe I went a bit too far and made the fit too loose.  :)  But here's my first try with decent simulation time (under 2 minutes).  I'll have to see what happens with the tighter fit and just making some constrained groups instead and see if that works better.  But that's a mission for another day.