Thinking about dining room layout/furniture

Last year we hosted for the holidays for the first time. It worked fairly well, but it was definitely a tight squeeze when we wanted to get 10 people around a table more suited for 8, in a room not really big enough for that. As we approach the holidays once again, we're looking to see what we can do to improve things!

We see three+ possible options:

1. Leave things as-is. The table set (from craigslist back in 2016) extends out into a square when we occasionally need to seat more than four people. Most of the year it's what we like and need, and we made it work last year even if the flow wasn't ideal.
2. Replace the table set with another shape. Perhaps a circular table that expands into an oval, to allow better movement around the table when extended?
3. Move the low cabinet to the 9.5' poster wall. Move the liquor cabinet to the other side of the window on the 12.5' wall, so that it can tuck in 3" (that side doesn't have radiator baseboards). Get a rectangular table that extends into a longer rectangle, rather than a square, in the now-open window-to-8'-wall space.
4. Something else???

Appreciate any thoughts!! I've attached images of the room, of our holiday setup last year, and a not-to-scale drawing of the room with dimensions. The dotted line is where the hot water baseboards are, so the secondary dimensions are those taking the baseboards into account. The computers/boxes in the corner are temporary and don't need to be accounted for. Don't be fooled by the wide-angle lens shot, I was just trying to get the whole room in one image but the open walkway is not that spacious.

Imgur photo album: https://imgur.com/a/9XmwOKu