Yes. Goku was fukking dead and had the best send off you could ask for. He was dying all the way through the android saga and participated in basically -zero- fights. Toriyama was clearly moving away from him. shyt, he could've died on Namek and through the next arc, almost nothing significant would've had to change.did AT ever ‘intend’ to move away from goku though?
gohan had his moment and made for a great place filler but I just can’t imagine him as the lead. i think goku was always going to come back.
plus let’s be honest the buu saga gets better when he shows back up.
And all that's just up for debate of course - but Toriyama is on record saying it as well. And the death threats, etc.