Looks good! I need to invest in some polycarb I think, looks the nuts... I'm also intrigued by the servo angled wedge, sounds pretty cool.

As for the rebuild, You got this!