HI Hagai,
In all honesty, I would not go with anything over the top unless you want to spend the money for NOS. If you want to maintain a smoother, more seductive presentation, the SED KT88 tubes would be a good choice. If you are looking for more authority, detail and resolution, the Electro Harmonix 6550 or KT88 cannot be beat. The Sovtek are the best when it comes to reliability but it is my opinion that the EH are the best all around. If you want to maintain the presentation you have had over the past years, look into something along the line of Valve Art KT88.
For the 12AX7 and 12AT7 tubes, again, the EH tubes are among the best current production used in the Jolida amplifiers.
Good luck and happy listening!!!