In my opinion, I think that it would be wise to buy more altcoins days before the fork takes place, most altcoins are declining in value and this might continue until the fork, this includes waves and ether as well.

You might be able to get them at a lower value, and I personally think that you have made a great choice by investing in waves and ether, they are both great coins with good technology behind, and they are further platforms.