I changed the 80 for the Zeiss Distagon CFi 3,5/60. The 60 feels much better and if I had to put money on it I think the 60 is sharper. Indoors always was a struggle with the 80 since I never got enough angle, with the 60 indoors and small studio's feel much better.
Not sure what your subjects are but maybe change the 150 for the slightly smaller 120 makro planner, you can still do head shots without the focal rings, and have a smaller gab between lenses.
Mann I would never get rid of that 60