The mast is too short, i think you should give it to me and build another one...
I think the rake will be fine, In that photo i suspect the rig wasnt in the middle (When we stuck it in quickly we never pinned it off, just had it on rough lashings) so i think it was off to port, that with the boat sitting on the port Ama gives the illusion of too much rake.
It will be interesting now that the boat isnt so nosey to see if you need as much rake to keep the bows out or to make it go upwind. I think alot will change and it will take some time to get used to tuning the mast again. Moreso with t