Dual boot Windows 8.1 and Ubuntu 14.04?

First the why's ...

I need CATIA V5 to put food on the table and it only goes as high as Windows 8.1 professional.
I want to create a host for developing NVidia Jetson base Robots and Ubuntu 14.04 is the current supported level.
I don't need OSX.

Where I am at...

Was able to install all three OS'es by themselves (as the sole OS) on the MacBook pro 11,5 with no issues.

Now I want to get both 8.1 and 14.04 working at the same time.
I loaded up windows first and used diskpart to clean the disk and create a windows partition.
Formatted NTFS, loaded windows, put the bootcamp drivers down.
rebooted
everything was great.

I started a live install of 14.04 and added swap and / partitions.
Started the install and then followed the instructions on the Ubuntu site to fix up the efi mbr at the end.
rebooted
grub came up.
picked Ubuntu.
It loaded.
everything was great.

Now here's where I am stuck.
If I restart and pick windows from grub ... I get the message that it can find windows.
If I restart and hold down the options key...I show one drive on the screen labeled windows...and it boots windows perfectly.

So I would like to either get windows working from grub.
Or a second drive showing up when options is held down that show Ubuntu.
Seems like I have half a solution on either side....even though its technically does work.

http://paste.ubuntu.com/16293031

Any advice???