Battle stages

The big new addition to Mario Kart 8 Deluxe is the battle mode. We know of 4 stages GCN Lugi's Mansion, SNES Battle Course 1, Urchin Underpass and Battle Stadium. What battle courses would everyone like to see and how many do you think will make the cut? 

With this being Mario Kart 8 I expect at least 4 more Battle Courses with 2 likely being retro and 2 being new. My guesses would be Skyloft, Tortimer Island, Wii Block Plaza and 3DS Wuhu Town. Here's my wishlist if there someone ends up being 7 new Courses and 7 new Courses.

New
Battle Stadium
Nintendo Switch
Block Tower
Dollhouse
Urchin Underpass
Tortimer Island
Skyloft

Retro
SNES Battle Course 1
GCN Luigi's Mansion
N64 Double Deck 
GBA Battle Course 4
DS Tart Top
Wii Block Plaza
3DS Wuhu Town

Honestly I'm only expecting there to be 8 total battle arenas, being the 4 already revealed ones, plus 2-3 more new ones and 1-2 more retro ones. I think Urchin Underpass is probably the only Nintendo-themed arena but I wouldn't be surprised if more came as well. I do think however that they will also be adding in other types of battle mode than just balloon battle and bob-omb blast. I'm kind of expecting a new battle mode that will be pretty interesting.