Type 'startup disk' into spotlight and choose which you want to boot into next time. Conversely you can boot into OSX from Windows by right clicking in the bootcamp icon by the clock and telling it to boot into OSX.
What happens when you hold Alt/Option during boot? Do you still have a Startup Disk icon in System Preferences? Is the Boot Camp partition still mounting on your Mac OS X desktop? ...