I notice again that we have the same PC router, so I have to ask.... Is it just me, or does changing bits on this thing purely suck? That little fiddly button to push (and hold) while you wrestle the wrench into the openings either side is a huge PITA. Bits tend to get stuck in the collet too, despite cleaning them often. PC routers have a reputation for long life, so I don't expect to ever need to replace it, but it seems like a design update is long overdue. I think all the other major router brands (even the Harbor Freight ones) have a built in light these days. I have a cheap old Craftsman router that has a shaft lock, built in light, and D handles. Neither has any provision for dust collection, but I have seen aftermarket ones for the PC router. It's standard on Dewalt and Bosch. This concludes my Router Rant.
Sorry for the hiccups in your build, it takes me so long to do my builds, but it's all about the deft recovery, and you are nothing if not deft. I literally forget how I did some stuff and end up reinventing the wheel. Maybe I should read my own old build threads before I start a new one.....