For the Madone 5.2, I can suggest a Park Tool BBT-90.3 and a HHP-3 press for a straightforward method of removing and replacing the bottom-bracket bearings. The HHP-3 will also work on your Giant's press-fit BB.

Beyond that, as it's already been suggested, just review how your desired tasks are done, and what sorts of tools are required or helpful for those jobs. Park Tool's site has a repair how-to section that'll help you pick out the types of tools you'd want.