Don't worry, I think your puppy is perfectly normal!! And maybe all of a sudden one week it will just instantly be better like it was for us. We still need to work on having him out in public--we just took him on a walk for ice cream, and the traffic and people and lights were a bit too much. But I feel really good about things, and I'm SO glad we kept him. I wish someone could have shown me the future a few months ago, but I probably wouldn't have believed it, ha ha.
Anyway, good luck, and I hope you can get enough rest and keep that puppy off the tables!