The Calypso has a really pretty minimalist circuit design. You are in a sense listening to the tubes. Which is amazing with good tubes but make using low noise / low microphonic tubes mandatory.
One thing you can try with Tung Sols is change the gain on the Calypso to the low setting. Its in the manual and just involves a set of jumpers on the main board (unplug it!). Large reduction in noise for me.
A set of reasonably priced NOS 6922's (seimans 1960s) may be worth trying in the Bat and you could always use them in the Calypso if you go that way.
One thing you can try with Tung Sols is change the gain on the Calypso to the low setting. Its in the manual and just involves a set of jumpers on the main board (unplug it!). Large reduction in noise for me.
A set of reasonably priced NOS 6922's (seimans 1960s) may be worth trying in the Bat and you could always use them in the Calypso if you go that way.