I can't believe I've just found this thread I've just finished the exact same conversion (except for diff combo and a few other bits).
I've made the mistake of buying a 3.0 e shell and as you've said it don't fit!!! Gutted so glad you listed a few alternatives I was lost as to what to get. Now I know Lols
I will be following this thread closely. Good job on the guide wish I'd seen it before I'd started mine though