On the oil change: That's the plan, and as much because that'll help flush whatever bits of the old bearing metal remain in the passages.
I tell ya, I had the block run through the washer at a local engine shop and I scrubbed the oil pan first in my cleaning tank, then in the kitchen sink with soap and water, and then ran it through the dishwasher - and there were still teeny little specks of metal in there that I could wipe off with my finger. It was exactly like the bad old days when strippers didn't get arrested for physical contact with the customers and though you could wash off the whipping cream you'd keep finding glitter in your beard no matter how many damn showers you took... at least, that's what I heard from other guys...