Trying to decide on letters of recommendation...

Hello! Trying to decide on my requests for recommendations -- as a quick profile, I have about 4.5 years of work experience in consulting, with 3.5 of those years with one Big 4 firm, and coming up on one year at my current Big 4 firm. My GPA in undergrad was mediocre (3.05), mostly due to family reasons. Also, I'm applying to non-US schools (I'm American), so both recommendations, I think, should factor in my international experience.

As a result, the first recommendation is definitely going to be my former partner from my first firm (even though he moved to another firm), since I worked with him directly for almost 2.5 years. He would be able to talk extensively about my performance at work, international experience and my personality.

What should I do about the second for most apps? I can also get a supervisor from my former firm, or I can get a rec from one of my extracurriculars advisors from undergrad, whom I still keep in touch with and knows my personal situation very well.

Advantages of second supervisor recommendation:
- Would confirm the experiences of my first recommendation

Disadvantages of second supervisor recommendation:
- Likely wouldn't add anything new to the picture

Advantages of second university recommendation:
- Would add more detail about my extracurriculars and international experience during university
- Would also provide insight on my personal situation and why my GPA was lower than expected

Disadvantages of second university recommendation:
- Though we have always been in touch, he would tend to focus on my university experience obviously, which was almost five years ago

Thoughts? I'm leaning towards the university recommendation because it would complement my first recommendation nicely (in painting a story from undergrad to my career and onwards), but I have often been told that professional references tend to be preferred over academic (not sure if this is still true).

Also, I have not considered a recommendation from my current job, because of the implications that I'll be leaving, and also because I feel one year is still not entirely enough for anyone to give me a solid recomendation (even though I'm performing well here). Will it look bad if I don't give a current supervisor recommendation?

Thanks for your input, everyone!