Well I guess I am apart of this super confusing issue

I have a trip booked April 28th-May 4th and June 2nd-9th, both are Disney resort stays. I am an Annual Passholder. When I went to make our Fastpasses for the June trip yesterday, the system is telling me I have reached my FP+ limit (I guess due to the April trip). Last year, I took 4 trips - 2 were in the month of May, one at the end of October, and one at the beginning of December and I never had this issue with FPs (and I had an AP then too).
I called the internet help desk and she told me that the 7 day limit applies for AP holders regardless if the stay is on-site

When I said, "well wouldn't it benefit me more to just have a normal ticket rather than an AP," she replied that the 7 day limit applies for normal ticket holders too

.... which I'm pretty sure is not true.
So.... what do I do? The April trip is with my husband and the June trip with my parents. I don't want to make FPs for my parents and then hope I can add myself after April