Replacing the PN2222 with a 2N4123 would make an improvement (re: previous reply-last image):
[color=navy]PN2222 Input: [color=red][b]30[/b][/color]pF, Collector-Base: [color=red][b]8[/b][/color]pF
2N4123 Input: [color=green][b]8[/b][/color]pF, Collector-Base: [color=green][b]4[/b][/color]pF[/color]