I actually like how my lawyer has things set up.

Paul - you’ll want to get a lawyer to create a  new lease that provides necessary coverage or at minimum an addendum for sub-lease/arbitrage situation.

This will include CPAs, lawyers, Realtors, contractors, property managers, and financial advisors. 

@Travis James Could you send me your recommendation for a real estate lawyer or title company. 

looking for real estate lawyer in south bay southern california beach cities

These are all questions I would be asking my CPA and my lawyer. 

I agree with you that it would be best to have both the company on the lease in addition to the tenant, we're just having a difficult time figuring out how to do that because of the language on our lease- It just used the word "tenant", so we're not sure how to clarify one party is financially responsible, while the other party will actually be residing there (tenant)-I"m not a lawyer so take this for what you will but I would not worry too much about the word "Tenant" in your lease.

We also retained a lawyer so the property won't forclose.

Here are the people I use for contracting (lawyer, plumber, electrician, punch list guy, etc).

Frankly it takes years to get this stuff down and no one knows it all not even lawyers :).