Boot problem on dual-boot MacBook Pro
Since you can boot into OS X by holding down the Option key and selecting your OS X partition, you just need to set the Startup Partition in System Preferences.

How do I set OS X to boot by default?

This will be persistent across reboots.