6/13 update:
More progress...
I started heat shrinking some of the 'packs'. I actually need to buy more heat shrink because I decided last night that I am going to double-up each 'pack' by heat shrinking them twice.
I also bought small 1mm thick washers that are standing off the rear brake disc from the hub, which gives me more clearance between the rear brake caliper and the motor housing.
I accidentally glued one of the foam pieces to the outside of the right side battery box panel. I need to fix that.
Getting there, I can see the light at the end of the tunnel.