I personally would trim the blocks, making sure there is a 1/4" beyond each point. Then trim the princess blocks that same size, BUT - that is just ME! I am fussy about my own work, where if I saw that in someone else's quilt, it probably wouldn't bother me as much. So basically what I am saying is, do whatever makes you happy.
Good luck! :)