I must be reading your post wrong because to me both your scenarios are asking the same thing.
I think whatever starts with Armstrong in 2.20 will be resolved by the finale as far as Paige/Waige is concerned...I honestly don't think having her actually date him would be realistic given her feelings for Walter and the fact that he hasn't given her any indication that they will
never happen. So I think it won't go on into next season.