congratulations on your new baby!! I would go with #1 too. He sounds like he will have a great personality and keep you entertained. Why don't you get #1 AND #2!!
I would also add a belly band to make sure he doesn't mark your house when you arrive. I personally would have him neutered asap and get any baby teeth removed.
Good luck!! Keep us posted and take LOTS of pictures!!!