The top pic looks more like an onion. Are the leaves thick and hollow versus flat like the garlic?

yeah, they are hollow tubes, but last year I got garlic 'seeds' (little tiny 1/4" bulbs) on a similar looking flower as the first picture.

Do the garlic scapes eventually turn into flowers that look similar to the one in the first pic? I forget.

The top photo is an onion (possibly a perennial bunching onion), the bottom is garlic. Onions (except for walking onions) do not develop bulbs on their flower stalks. Garlic scapes (which look like flower stalks) have a cluster of bulbils, and may or may not have flowers as well.

For purposes of bulb growth, both scapes & flower stalks should be cut off as soon as they appear. The bulbils from the garlic, if grown, will still be clones of the original parent.

hmmm so i guess i have some scape cutting to do.