I assume you found a summer slip last year, but I like to add a couple of comments for future readers of this thread.
Yes New Buffalo is the better of the two you asked about.
Yes Eldean is a great marina with fantastic service, but you're not in walking distance of Holland, being on the West end of Lake Macatawa and yes Holland is quite a drive from the West burbs.
Two other options would be St.Joe/Benton Harbor and South Haven.
These would be only 10 to 20 minutes farther North and compared to NB offer the same or more in regards to quaintness, restaurants, shops, etc.
Good slips, for any type boat and many more available than in New Buffalo and with a good price range.
Worth checking out.