Both the trendline and the channel have failed to perform as well as I expected. The price is still hanging around their boundaries and we still most likely will see some upside movement currently but now my plan is to take 50% profit at 530s, setting a stop loss at the new, lower BE and then hold out the other 50% of the trade till 620s-640s (50% retracement of the 5 waves shown above).
Also, yesterday I almost got stopped out (the price bounced literally $0.1 away from the stop loss) and to be honest this price action is not very comfortable to be in a trade now, I might have rushed into the trade too early.