So a quick update on my day:
I scoured a large amount of the department stores all the way from Tokyo Station up to Ikebukuro. Turned up empty handed on any type of vintage Japanese whisky - except at Mitsukoshi Ginza duty-free level I saw the limited edition Hibiki 21 for 50,000 yen. No thanks.
Don Quixote in Shinjuku was a tease - they had the price card for the Hibiki 21 displayed but didn't have any in stock. They had multiple bottles of Hibiki 17 for 11,990 yen + tax. The Roppongi and Asakusa locations also had multiple bottles for sale.
Checked out some of the bottle shops in Ginza/Ebisu recommended earlier on here and also came up empty handed. Did see a Hibiki 30 at one shop for the princely sum of 249,900 yen.