I have a suggestion for you on the wraps. Instead of lettuce, try celery stalks, and "stuff" them with the avacado/tomato filling (leave the celery out of the filling mixture). The celery should fix the "needs salt" thing, and it's nice and crunchy, a pleasant contrast to the creamy avacado and the tangy tomatoes.