Sounds good. If you feel a bit more appetit for more risk/reward, change some Bitcoin to ETH, then use this ETH to buy some DRGN (Dragoncoin) and ELTCOIN. Very young coins but they seem to have a great potential and active development. Of course it is much riskier then just holding IOTA or WAVES.