Show only Local files on iOS?

I have had iTunes match since it came out, and one thing has really frustrated me...maybe someone has a solution.

I have a 16 Gb iPhone and 12k songs in my iTunes library. I clearly can't download them all. So when I look for something to listen to on the iPhone, the vast majority of the artists, albums, etc, in my list are not stored locally, as indicated by the iCloud icon. However, ANY artist with ANY song in the cloud (even if I have 5 full albums physically on the phone) shows up with the icon. This makes it difficult to quickly find a whole album or playlist of local tracks to listen to.

Is the ANY way to ONLY see the local files? I don't always have a fast 3G connection, and I do always have a monthly data limit.

I'd also love to be able to hit shuffle and not have to keep waiting in silence for the next track to download.

I turned iTunes match off in the phone as a temporary solution, but now if I ever turn it back on to download something from my library, it will want to erase everything on the phone and try to re-sinc the full library. Am I missing something?

Thanks!

~Justin