You're being very good and attentive and sensitive to his trauma, but the truth is....it will last as long as you let it! Just remember, sometimes, kids have to be left-you did nothing wrong! You've got to put him back into his routine and let him adjust, not let him be the leader. After whole week, he is already learning that he can control you into staying by his bed etc. Crying a super long time at 5:30 and demanding consolation is also manipulative (not trying to be mean at all, kids are very smart). He was not harmed by your being gone for a week.
Cut the shinanegans, do not cave into the night time theatrics at all, but do spend some extra quality time and attention within the proper day time schedule. Go back to business as usual and be his affectionate confidence-building mother like you always have been. Don't give in to the "damaged" act, or he will get better at playing that card as he gets older. The fact that you say, "I was expecting this" implies you..were expecting it! I'm sure he read that into your actions.
When we left our kids for a week, we pretended nothing other than that it would be fine. My 3 year old daughter did get upset the first time I ran to the neighbor's when we got back, not knowing how long I would be gone. We just let her know, we were staying right here, We would tell her if we had another trip, but that we weren't going anywhere, and proceeded business as usual with everything. She got over it right away.
All kids are different, but don't "encourage him" to act like you have done something wrong. If you act super sympathetic about it, he'll believe there is something he should be upset about. Good luck, he REALLY IS OK!!!!