I might elect to have the kid assist in all of this. Nothing like an engine swap saga to deter from bonehead mistakes, neglect, carelessness, however you want to look at it.
Unfortunately, an initial $15 O-ring on the oil pump pickup was possibly the original catalyst that starved the pump.
Without the the official diagnosis I would have guessed AFM related failure, which is pretty common. You can't trust that system but ignorance is bliss. Wish you the best and fantastic work on the swap. You make it to seem fairly effortless!