Take a look at this blog article. Acid etching is not a great way to go about it. You are far better off mechanically grinding.
Acid Etching Concrete Pre-Epoxy - Why It's a Bad Idea
Check out our 4195 Wicking Epoxy. It serves as an Epoxy - Primer, and wicks deep into the concrete.
This product can withstand up to 8bs of MVE (Moisture Vapor Emission) unlike off the shelf kits you can buy at home depot which are rated for around 3lbs.
Also comes with a lifetime warranty...
Also take a look at Divot Patch. It's available in 5lb bags, goes on easy and dries in about an hour. http://www.garagecoatings.com/Concrete-Repair-Preparation/Divot-Patch-Concrete-Patching-Compound-5lb-Bag.html
For expansion joints, you can use a polyurea joint filler or even mix up your...