Not sure if there's a way to salvage your current layout, but you might try starting from the beginning again. I'm guessing there's nothing important on the drive right now.

Boot from the OSX disc and do a full format/erase on the drive. Create a single, whole drive partition for MacOS and install it. Then use GParted from the Ubuntu live CD as described in the guide to shrink the Mac partition and create your new ones.