The HR with points and cash used to be a steal.
You'll be very close to the Tokyo Metropolitan Government Building so make sure to check out the free observation deck. There are also "free" tours that leave from the visitors center there. You're expected to pay the tour guide's travel costs, but it's a great deal for an English tour that only sets you back a few bucks.
Thanks, I booked with C+P. Why is it no longer a steal?
In any case, happy with my choice for now.