I am no expert, but I think if I were in your shoes I would stick with the architects plan to put a 25 degree pitch in the roof. From what I have read from Ethan Winer (Real Traps), irregular shaped rooms sound better because of the varying angles of reflection and he said that he preferred angled ceilings as well.