Actually the changes I am making are a little different.
I already have an A class carbon mast and am fitting wings so beam won't be widened and there are good arguments for that. I am still deciding what height to have it. I will trial the boat as a super sloop with the larger genoa and if I can hack the pace I will cut the size of the jib and add a roller furling hooter kit because I can't be bothered with a Spinny set up.