They will either have to have time go back and be reversed and Goku has to train up again or yeah, they will end up having to focus on someone else. There can't be anything beyond being able to beat Beerus.Like anything after Goku becomes a god will seem like bullshit tbh. If anything, I'd rather they focus on Future Trunks or adventures of Goten and Trunks.