As for next summer's eclipse, I recommend you forget Tunisia and just go to Tangier, opposite Gibraltar! It's a quick hop on a catamaran from Tarifa. Morocco is good value and much better set up for independent tourism. And Tangier is right on the line of the eclipse, from memory it will be a full 4 minutes there! Should be quite special if the clouds stay at bay.
Tangier is absolutely also an option. In fact, doesn't the totality also pass over parts of Spain? But I figured that might be too expensive and crowded. I thought Tunis has been doing reasonably well lately (though I haven't been keeping up to date) and it has the advantage of also having Star Wars-related locations to visit.
But I haven't looked into any details at all yet. I'll keep all of this in mind.