And if Test Kitchen and Pot Luck Club don't work out, Aubergine and Bizerca are worth considering. Good African staples like curry and mieliepap can be had at the no-frills The Diplomatic on Long Street (I think?), and the owner, Chris, is a super friendly guy.

Next time you're in the winelands, head to Swartland if you're feeling up for the trek. They don't really do cellar doors like the established properties in Franschhoek and are generally by appointment only, but that's where so many great wines are coming from in the region right now. Sadie Family, AA Badenhorst, Lammershoek, Porseleinberg, and Babylon's Peak are wines to try and watch for, although I don't know if some are yet available in the US. Since you enjoyed that Hamilton Russell Chardonnay, do try their pinot noir if you haven't already. Elgin and the Hermanus areas are pumping out some amazing pinots. You can also whale watch over there at certain times of the year, apparently.

If you do stay in Stellenbosch/Franschhoek again, I absolutely second Delaire Graff and would also recommend Rust en Vrede for the 6-course with wine pairing. A late lunch at La Petite Ferme in Franschhoek also affords great views over the valley with food to match.