Believe I am going with a rebuild from these people in Southern California. Have spoken to a few shops that install them. None have years of experience with the rebuilds, but so far they have all been fine. About $1k for the case and $750 to install. The only reservation I have is the relatively short warranty period. 6 months. Not great, but also not unusual am told.
http://www.tcbmwx5.com