You are correct on both accounts.
# 1 Turbotax guided me first through the passive category for the dividends. Only after I completed them I was guided to general category for wages.
#2 I paid more foreign tax on wages/ general category than on dividends/ passive category.
