LOR from academia (from TA) vs from industrial research lab?

I am in the midst of the application process, and in need of an advice. For the vast majority of my applications, I have to ask a Ph.D. student who was also my co-researcher at the master's level, or my 2 supervisors in industry. For the unis which welcome more than 4, I shall take the liberty of asking them all, but there are a few schools like UCB and UMD which speak of uncertain consequences on submitting more than 3. I am in a dilemma for those uni's that explicitly state that 3 is the optimal number of reco letters. Here is my situation:

1. Letter from the TA : He was my TA on 2 courses which are relevant to the area that I am applying to. Knows me for over 2 years and have also co-authored my IEEE transaction paper as the second author. We have also worked together as TAs.
Pros: Knows me better, and our work is on an area that matches that of a prof that I am targeting at UCB.
Cons: Ph.D. student

2. Letter from supervisors at industry: I work in an industrial R&D lab as a researcher, and my project is in the area that I have applied to. I am advised by 2 people and both have Ph.Ds - one from IIT and another from US.
Pros: Officially my research supervisors
Cons: From industry, knows me just for an year.

I know that both options may be sub-optimal, but I have to take a call anyway. Assuming that my graduate thesis advisor would provide me with a strong LOR, is it advisable to take both LOR 2 and 3 from my 2 current supervisors, or should I take one from the TA and another from either one of the supervisors? Sorry for the long question. Kindly share your views and suggestions, as I have little idea about how adcomm looks upon such situations.

Thanks