Ive heard Steve Mills' shop down in colorado springs is pretty good with engine rebuilds, not sure about N54 specifically though. It does say on his website BMW is one of the brands they specialize in
http://www.stevemillsracing.com
Give them a call and see.
Thats all i got