I do upgrade both that's true, but if the timeline for the last soulbound set is any indication, the last part will be the hardest because of all the duplicates, and my current prediction to complete the set by end of August could very well extend into the fall due to that reason, so it's going to be close. Last time I had to burn most of the duplicates (except those that I eventually maxed out as GF as well), to be able to almost complete the set (missing 2 BCXs).

I want the set completed, that's sure. If I can max some GFs in the process, I'd love to.