I think we should build the other 3 decks first, and see where we are at against aether with regards to vault capabilities once those 3 decks are nailed on.
This is the period of war which i think we can find really enjoyable. I don't think people will expect us to still have shipwrecker or SoP Wardens, and I also think we have a few suprises with eternity (which can lock someone down on its own, though not this round) and a few other bits and pieces. Each victory at this point will be a mini-win in itself, so we should take as much pride and pleasure in them as we can.
I do think that suiciding against aether is an option, but only if we feel we can't build a deck against anything they are likely to send against us.