If I were in charge of this mess, I would simply limit Fastpass to Resort Guests only (and better yet, ADRs too). It wouldn't matter what type of resort you'd stay at either, you'd be able to book fastpasses on check-in day, check-out day, and all the days in between.
A month before your trip...