Just built this and its really, really good. Used the final layout with 2N2222As and 2N5088 as mentioned by anders. Used some unknown big glass Ge diodes for D1 & 2. Will try others at some point to see if they really make a big difference, but i don't have much of a selection to choose from at the mo.
Here is a pic of the build.

Excuse my shabby building

.
Thanks for the layout anders

.
"Red velvet lines the black box"