CornRickey must be reading my mind I would make all the same changes move the windows in the mud room and front bedroom to the front it wont cost any more and will add to the look of the front. Go with one 16' and one 9+ garage doors as high as possible. your wife will thank you for it later and don't even think for one moment you are done with boats Its cheaper and easier to make the changes now to accommodate the new boat coming in the future . Is there going to be a basement ?