i'd suggest you wait on the new shadeC, i cant give a time as to its arrival, few weeks/months maybe? but i dont think it'd make sense for you to go through this much work now, only to change it then ? so move on to something else and come back to the terrain if you can