The consummation is a time span, the time span we're living in. There will be shepherds and teachers until that time span, until the beginning of that time span.
You quoted V1 as saying:
it was his will that in his church there should be shepherds and teachers until the end of time.The end of time is the end point in time, it is when time stops because time ends and eternity begins for whoever is left on earth, it's when Our Lord comes again, that is the final judgement, that is when all of human history comes to an end, which is when the world ends, but the end of time is not a time span. Up until it's end is a span of time, but time's end is not a span of time - and no one except God knows when that will happen.
Up until that time, there will be priests and bishops is what V1 says, the only way to make it say what you are suggesting it says, is to change what it says, which is what you are doing, you're just taking the long way around.
You are suggesting it really says:
it was his will that in his church there should be shepherds and teachers until the beginning of the end of time. We can toss bible verses back and forth all day long, only to determine the world actually ended in 1906. Best to just accept V1 as it is written.