Yes to all with some fine tuning.
If your expectation is a big move up, certainly, add the long delta because if you don't, you'll spend the next $1.60-$1.70 (or so) of an up move making up the drop plus the decay incurred during the elapsed time (assuming no IV bump).
If you expect a...