In terms of size and keeping with the spectacle of Toothsome, it can't really go anywhere but Saddle Ranch without either removing a parking lot or tearing out a large portion of the existing CityWalk infrastructure. Part of the appeal of Toothsome is the whimsical, larger-than-life atmosphere it projects. It has to have its own space (Where else are the smokestacks gonna go?!) You would lose the performance venue inside Saddle Ranch, but I know Toothsome does have a full bar. That being said, I'm not sure they'd want something quite so flamboyant that close to the entrance of the park.
I could see Cowfish going in where Tony Roma's or Johnny Rocket's is now. I don't know how good/popular Samba is, but I've never seen it very busy, so that's a possible location as well. I'm not a sports guy, so I would be perfectly fine if NBC Sports Grill & Brew did not make the transition.
Something I'd like to see is the addition of a permanent, expanded drop-off/pick up area. For HHN, they move that area from the little bend near Buca Di Beppo to a section in Jurassic Parking. As park attendance rises and ride-sharing services like Uber and Lyft become more popular, I think making that move permanent as well as adding permanent benches would be a smart move. In a similar vein, I think an enclosed (or at least covered) seating/waiting area near the shuttle drop-off would be a huge quality of life improvement. No more waiting in the sun/rain, no more standing in a temporary plastic queue, perhaps more prominent signs detailing the time of the next shuttle. Plus it would look a lot nicer than a bunch of people awkwardly and uncomfortably standing around waiting.