So you think you'll be able to at least recoup a portion of your cost before the fork?
I think I have lot of time with ETN

My friend is really excited to play with it, hope he can OC it a lot

If it's true FPGA it should be no problem to update, there are no big changes, Baikal would fix all these trust issues with firmware update also.