Here is something I threw together based on the items you use in your template. Its certainly not perfect but its better than your current template.
I worked out that given your current template, even WITH the celerity proc you are still not capping your swing speed. Without the celerity proc you will be swinging around every 2.5 seconds with your current template and every 1.6 seconds with celerity. With this template you will be swinging every 2.0 seconds without celerity and every 1.5 with.