Sounds like you learned at lot! Generally if you are heeled over 25+ degrees consistently, you are overpowered. Most boats sail better when they are "on their feet" and not heeling so much. Learn how to depower in stronger winds by flattening sails, dropping the traveller, moving the genoa car, reducing sail area, etc. Makes for a more comfortable and faster ride.
Do you have telltales on the genny and main? If not, put some on. Will make a big difference in being able the trim the sails to the conditions and point of sail.