Power selection circuit for USB or DC Jack - both at 5V
One simple path that has escaped your considerations is that most DC power barrel jacks have an additional contact, precisely for the purpose of easy selection of power sources. See this contact in your schematics, red circled:



There are many uses of this extra contact, and I am sure the use of it will highly simplify your problem.