From the questions asked I'd say stay away from hydrochloric acid.

Its far too easy to hurt yourself or others if your unfamiliar with chemistry.

Citric acid will work just fine.

Also, never throw away stuff from extractions until your satisfied with the final product. If a mistake is made somewhere, the product should still be in one of the fractions and would typically be recoverable.