So I changed my oil and filter today and used 6.5 quarts total but was reminded of this conversation.
The FSM says to fill the filter before install - which actually takes a bit of time (maybe 10 minutes?) I eventually put almost 0.5 quarts in the filter before install but you have to fill, wait for it to settle and burp, then fill, wait for it to settle and burp the air out, and repeat quite a few times.
After that I installed the filter and 6 quarts in the engine. My dipstick (factory 2016) shows full. The FSM also warns against over filling, so I’m just sticking with the 6 quarts it calls for (plus the half quart in the filter).