Consider investing Lisk and Waves with a big portion of your money, put some of them to ETH, and leave smaller portion for BTC. Actually, you made good decisions, then you had 12 BTC. Maybe you can suggest us what to do 
I hold both of these projects and I believe they are up to some good things in the future. But never go all in. So perhaps hold 50% in btc and the rest in altcoins like Lisk, Waves or another good one. If BTC goes up you may be end up with some better bargain prices.