[villagetinker]

I am not a fan of vinyl flooring, especially on concrete, if the glue is not applied correctly and the flooring not completely rolled correctly, you get problems. IMHO, the problem with the vinyl flooring may not be repairable, and matching the existing (2+ year old) vinyl with new vinyl may be difficult. I would just start calling various flooring companies, to see who would be willing to look at the flooring and discuss repair/replace, and provide an estimate. You can then check their references and reviews.
As for the carpeting, there are a few companies that will re-streach your carpets, and this may be your best choice. Ask them who moves any furniture before you have them come out.
Hope this helps, and very sorry for your problems. One word of caution, if you decide replace your flooring with something like the floating wood flooring, I would strongly suggest that you have the vinyl flooring removed, as you are going to lose clearance for the dishwasher and when you need to replace it in the future this could be a significant problem.