Well... I did it!
I woke up this morning and I was thinking about my Yacht/Beach Club dilemma and I made the move. I called Disney and changed my resort reservation to The Beach Club, pool lagoon view/full balcony/king bed. Other than the pool/lagoon view, the others are just requests and will hopefully be honored. I am very comfortable with my final change because my preference was for the refurbished resort. I also like having the quick service there. Now I can plan my dining and FP's as my March Trip approaches. Thanks for all your comments and advise! 

