I've never really bought into the theming at the GF. I think that for the money I would rather do the Poly or BC, but ehh.
I did the same thing the one time I stayed at WL. I only had 2 nights at the resort during October. It was nice to have the boat for MNSSHP, but I felt like I paid way...