New glasses: Option A or B?

Hi, everyone.

After having the same pair of frames (last pic), I've decided to go for a new pair of glasses, between two choices. Please ignore the hair: I know it looks awful.

Option A is pics 1-3 (lighter round frames)

Option B is pics 4-6 (darker sqaure-ish frames)

I'm leaning towards option A as I've been told a rounder shape is more complimentary than my current rectangular shape, but I'm worried they look too thick compared to option B.

Out of both options, which do you think is more complimentary?

Thanks!