No that would be too much.
Getting 1st & 16th isn't THAT bad tbh. The compensation for getting last pick is that at least you got to pick anyone you wanted in the cast for your first pick.
EDIT: If they were confirmed to also be going back in then I could make them an option instead of whoever's left as 16th but it's not confirmed so it wouldn't really be fair to just give that person away to the last pick.