It seems like it will be best to switch when we have four pieces for the bonus. The two bonus is underwhelming and even nerfed the four piece T17 still carries weight. Thoughts? Haven't seen anyone numbers crunched by people to create an argument for either one but it seems like keeping T17 till your can four piece 18 is a good idea.