At this point Orton, Big Show, Kane, Bray Wyatt, Baron Corbin, Dolph Ziggler, Rhyno, Heath Slater, Jason Jordan should all be in Battle Royal. They deserve a payday, but not a giant spotlight on them. WWE roster have all the talent, and this talent deserve a WM spotlight much more than the guys above.
I'll also like to see a little shakeup after WM, with Alister Black, Ember Moon, Jeff Hardy and The Miz going to SD, Baron Corbin, Mysterio and Kairy Sane going to RAW. Show , Shane and Kane retire and Orton going to NXT, Orton could be a huge asset there, reinvent himself and return in 2019 RR match, while on the main rosters he does nothing and only cost time. But this is a whole other story.
I'am your friend!