I think you should use only one of platforms.
In this way, after ICO, there will be two kinds of tokens. One in ethereum platform and another one in waves platform. It will be confusing.
Waves is a good platform. In my opinion use that for both pre-ICO and ICO. There will be no problem.