Sounds excellent, except I'd be replacing the celery with mushrooms. Mmmmm, creamy mushroom tuna-ness... my mom always used cream of mushroom soup for her tuna casserole, while my aunt used cream of celery. I liked my mom's better.

Either way, major comfort food.