Syncing Gmail 'All Mail' with Mail.app Inbox

I just purchased an iMac and in the process of setting it up, I forgot the struggle of getting my Gmail account synced across the web client, mail.app, and my iPhone.

When I initially set Mail.app up on the iMac, I made the mistake of letting the app automatically create my account, thus making it POP. The next day I learned the error of my ways, as my mailboxes weren't functioning as they used to. I have since deleted that and created an IMAP account, but I think the damage is done?

Previously, both in Gmail's web client and in Mail.app, Gmail's 'Inbox' always appeared as 'All Mail.' Now the inbox only displays messages since yesterday, when I reset the IMAP account (I also had to go into Gmail's web settings and uncheck 'Enable POP access'). To view older messages, I have to go to 'All Mail.' I realize this is just a small inconvenience, although since I don't ever delete messages from my Gmail, I'd prefer to always have all the messages show up.

I've done quite a bit of searching through google, but none of the guides showing how to sync Gmail through Mail.app and iPhone haven't touched upon this. Can anyone offer possible solutions?