Trend : Uptrend
Current wave : Wave3 to Wave4
Note: I see option 1 as WXY as combination of zigzag and triangle and option 2 as combination of zigzag+triangle+zigzag.
Plan : Wait until triangle complete before joining the uptrend to Wave5 or wait the completion of option 2 complex waves.
This is only my point of view. No trade recommendation and do your own TA for confirmation.
TAYOR