Police Academy 2: Did It Jump the Shark Already?

Okay, fellow Gen X'ers, moviebuff_marc here, back at ya. I just rewatched Police Academy 2: Their First Assignment. Now, I loved the original. Lighthearted, silly, but it had that '80s charm nailed. This one... I dunno. I'm torn. On the one hand, more Hightower (Bubba Smith!) always a win. And seeing Tackleberry (David Graf) go even more over the top with the weaponry was kinda hilarious. Plus, the whole street gang thing led by Zed (Bob Goldthwait) was genuinely absurd and kinda funny. Remember when absurd comedy was actually absurd? But parts of it felt forced, ya know? Like they were trying too hard to recapture the first movie's magic. The whole 'Mayor wants to get rid of Lassard' plot felt kinda recycled from like, a million other comedies. Did anyone else feel like the humor got a little...cruder? Less slapstick, more, uh, questionable jokes? It's not bad, exactly, and I still chuckled at times, but it definitely felt like a step down from the original's innocent, if slightly raunchy, vibe. I guess my question is, did Police Academy 2 already jump the shark, or am I just being too nostalgic for the simpler comedic times of the first film? Did it lose something important?