Agreed except on the bunks issue. While it may have gone against what GR originally envisioned, the only way you're going to fit 430 crew into non-bunk accommodations is for 95% of the Enterprise interior to be bedrooms.
Bunks are just way too practical NOT to be used
If the average cabin is between 10 x 20 and 20 x 20 feet (200 to 400 square feet, 430 cabins would total 86,000 to 172,000 square feet. If the radius of the saucer section is 200 feet, the widest deck would have about 125,663.6 square feet. The widest section of the saucer has two decks for a total of about 251,327.2 square feet. And the narrower upper and lower parts of the saucer could also be used for cabins.
Kirk's cabin was apparently on Deck five Room 3F121
McCoy's cabin Deck Nine, Section 2, Room 3F 127.
Janice Rand's quarters were at one time Deck Twelve, Room 3C 46, and another time Deck Twelve, Room 3F 125.
Harry Mudd was temporarily in Room 3F 125., deck unspecified.
http://memory-alpha.wikia.com/wiki/Quarters
Since the quarters were spread out over at least eight levels of the ship, it is possible that there were 430 individual cabins for crew plus some more for guests.
The Enterprise A and the Excelsior in STVI seem to have had fewer cabins and crew and junior officers assigned to multi person cabins with bunk beds to save space for something else in the saucer section, presumably some bulky machinery.