Dear,
1) For to merge the all in the same schematic, and make a unique library with all Digikey links revised, 1.5Hr at $20/hr=$30
2) For making the new PCB, taking in count the previous design (Track widths for power stage), 5Hr at $20/hr=$100.
3) For making a final report with BOM and all that you need to manufacture, 1Hr at $20/Hr = $20.
Total = $150 - Special discount = $120
After finished the Schematic and started the PCB, all extra modifications at $30/hr.
Regards
Juan