When I paper piece, I make templates. The method that works for me is to do a mock up in paper with all seam allowances added. It really seems to work well. I find there is less fabric waste. I agree with you. Those diagonals can make you want to tear your hair out! Good luck!