Was 2nd wind and/or subclass features factored in?
No. Anything that would prolong the fight equally on both sides, as we have seen, would only strengthen the relative value of the +1, so that's all that would happen with 2nd wind.
Any subclass features would likewise either increase the value of the +1 if they were defensive (prolonging the fight) or decrease the value of the +1 if they were offensive (made the fight go faster).
But if you wanted to compare the value of the +1 to a subclass feature, I could give Starsky that feature (similar to what I did with bless and action surge.). Was there one in particular you were interested in? If it's simple to code I can try it. (If it's complex to code I might not get around to it.)