Given those numbers, I agree that the 360 package in your case offers the best value.
I also agree with Richard`s recommendation of the Deluxe Room, and would like to emphasize that they are well worth the little bit of extra money.
I believe the difference is 7,000 yen, but the room is bigger, more impressive, and much more luxurious.
Enjoy your stay in Tokyo!