I set everything up using the
MDE website. It was a lot easier and I always felt it was a little "safer" to do it that way. Once I am on site and in the parks, the app comes in very handy to change fp+'s around. You have plenty of time to book them since I don't think the time slots will fill up until closer to your trip dates and then it would be only for the most popular and limited attractions - like Toy Story Mania or a fp for Wishes.
The Be Our Guest lunch fast pass reservation is not made in the dining section of the WDW website. Nor it is a regular fp+. It is a separate reservation made on a different website. Here is the link to the website:
https://beourguestlunch.disney.go.com/
Reservations for the lunch usually don't open until close to the beginning of the month. April dates are open now, but I'm pretty sure that they aren't open yet for May. Also, you need to use a 12 digit reservation number. There can't be any letters in your reservation number. If you have a reservation number with a letter in it, then go to the Manage Magic Bands section of your MDE account. There you will find the 12 digit reservation number that begins with a 4. Use that number when trying to set up your fast pass at the Be Our Guest website.

I hope that helps.
I know how you feel about the woods view rooms. We like them better than courtyard and don't want a free upgrade. So far, whatever room view we booked was the room view we received.
The villas are going through a room refurbishment. As far as I know there isn't any outside construction. So you won't even know anything is happening over there.