You have loved the preamp, plan on keeping it in any case?
BOTH!
Why not? Money? I can understand that, not to mention packing/shipping/return shipping. I would do tubes first.
Tubes: can you bias them yourself?
many tubes last 10,000 hours. Buying new tubes, original, or, a different type/breed. Someone like Brent Jesse will take them back, let you try a different brand if you don't like them after a 60 hour burn-in.
i.e. I bought new KT88's, liked them better than my 6550's. I have the 6550's as spares, so I will never be in a hurry in the future.
i.e. I bought sylvania for pre-amp, didn't like them as much as original, burnt them in 60 hrs, sent them back, tried some GE's, half the price, sound great.
You can always do the caps later.