Probably, yeah. If the team is under .500 by next May and Edwin and Jose both left in the offseason, I could totally see 15k on weeknights again. Giveaways will still be sold out though.
He's never come close to making 17 million, so it depends on whether he and his agent believe there would be a 20+ million dollar deal out there somewhere.
The inconsistency will always be there until they have a permanent umpire crew dedicated to replays. As it is right now, there are different umpires in the replay booth each night.