mmmm love me some hardsurface!
Looks solid so far, i would recommend using substance painter/ndo for bolts and small normal detail, you get some crazy crisp normal details with those programs, and wont have to fiddle to much with the baking process.