I need help with a client's Google Places project

I ran into an issue I have not faced before and wanted to get a little feedback before I get back to the client.

The client purchased a beauty salon that had previously been marketed under the name of a large makeup franchise using a replicated site. The Google Places listing has been claimed under that name and pointing to the replicated site.

When the name of the makeup is searched, the Places listing shows up. When any of the other keywords are searched for, the Places listing does not show up, even though the keywords are in the Places listing.

The owner has a new website that is the name of her beauty salon and she would like to have her listings show up under "day spa", "massage", "skin care" and a few other terms.

If possible she would like to keep the Places listing that is using the name of the cosmetics company.

What are my options? Should I:

1. Try to get a second listing under the name of the salon? It seems like I could run into some conflicts and possibly make things worse.

2. Change the name of the listing from the cosmetics company to the name of the salon?

Someone, possibly an employee, has claimed quite a few citations as well, but they are under the name of the spa and not the cosmetic co.

I appreciate any feedback.

DTaylor