If you can affort and find, try NOS Tung Sol 6SU7, which is 100% replacement of 6SL7. This tube sounds fantastic.
For 6SN7 I highly recommend NOS Mullard ECC33, brown base, short bottle, but thats only if your amp can take that tube, ask Almarro guys directly. Other than that, try Italian made NOS Fivre 6SN7, brown base, they will match Tung Sol perfectly.