Toshi,
Good to see you still working on this difficult build and staying afloat (I couldn't resist, but should have).
I feel the pain with fiddly builds, but your doing a grand job of it and will sail through it (again sorry for the bad pun).
May you be blessed with wind in your sails to complete this build.
Damian