I found one more fast part. If you happen to have an MPSH55 in your junk box, or you can get one more easily than a BC556 or KSA992 (Netty Electronics has a few dozen left), it will do great with 100pF to 220pF added to C370.
With 100pF added across C370
MPSH55 55ns 35ns 80V Motorola, old
With 220pF added across C370
MPSH55 50ns 25ns 80V Motorola, old
I have not found a modern part that does not require C370 augmentation, and I'm giving up the search.
