Personally i would scrap No Way Out but not have no event in between, have a Saturday's Night Main Event, most years, it would be good for building up rivalries and would not need any drastic changes or huge gimmicky matches. It would be easy to build up from.
And in this case, it could lead to Orton's rivallry with the McMahons taking a dramatic turn (which im expecting it to happen at No Way Out) without it being so like its No WAy Out and smething like this should have been done at a regular show.