Recommendations, searching for a new 35mm

So I’ve borrowed my brothers Canon AE-1 for the last 15 months, it was great but there’s way too many light leaks and the shutter keeps giving me issues. I’m looking for some recommendations for a new 35mm camera. For context, I mostly shoot medium format with my Mamiya 645 and my Pentax 6x7 but I want something that I can get more shots per roll and easier to use on the go. Should I stick with the AE-1 model? Or try an Olympus or Nikon?

EDIT: Not a deal breaker but any recommendations with a waist level view finder would be cool. Again not a big deal, I guess I’ve just always wanted to try it out or have the option

EDIT: Thank you everyone, went with the F3, found a great deal on one and went with it