The lines are fuzzy, and that's why we have the term "Zilennial". So let's just toss them into that category and call it a day.
Edit: Wikipedia says the cutoff for Millennials is 1996, which would make OP an older Gen Z. But I still think "Zilennial" is still most fitting.