The numbers reported above look right. The deceiving thing about that is lockoff 2BR's are included as 1 room and not broken down into a separate 1BR and Studio. The actual number of villas available at each resort is higher than the totals shown for that reason.
I have a listing of all WDW resorts at home and will try to find it to post if no one provides it sooner.
You might also post this question on the Resorts Board for a faster answer.
Enjoy!