Yes, it's correct.

You have to check with SQ res as to whether there are any Skysuites on those flights. I know that SQ11/12 definitely has them but am unsure as to whether Wiseman has been introduced yet. (It hadn't in May).

Amenity kits are not distributed for day flights nor for 'regional' flights. I think TYO falls short of a long-haul flight.