To be honest neither option immediately jumps out at me as being great. Any reason you want to build the GF on your PPOR?
I think there was a thread earlier outlining a lot of the tax related issues it can cause, let alone the hassle factor of having a tenant in the back yard.
It also...