I think it will be the second - Dorne will be antagonists to the Lannisters this season and there will be more assassinations, or possibly all out war. Maybe they'll last long enough to be involved with the Iron Islanders as well but Ellaria doesn't seem to have the political skills to be a player in Dany's return to…