I used to struggle with finding the right tabs as well, but now I find that double clicking on the file in the "File Navigator" view is the most effective solution for me. That, and F7 to switch between the code and designer views.

But I too find the tedium of closing two tabs annoying (again, pressing delete in File Navigator is my preferred method).