I'd suggest double majoring if at all possible, this will help keep you options open. Of course at most schools this will reduce the amount of elective classes you can take, but the end result is probably worth it. If you can find two subjects that add value to each other, but have different core markets(eg. CS & PSCY with a intent of going into HCI) thats a nice plus.