You should already be able to configure this in the recently added Player Experience improvements: Set Show Up Next to When Video Finishes.
Show Up Next
When Video Finishes