correcting a NDG7475

I've been wanting to build a 1W 520 for a while now. I hate the beam specs though. I finally came up with an idea for a host which I'll try to keep under wraps until the project is finished. The problem is getting a better beam. I've been looking around and came across this.



Is it necessary to focus the beam before sending it through the prisms? Is there a better way to make the beam more square/round? I want to do this with the least number of optical pieces possible while being able to make the beam more square/round.