You are doing fine.
Read any of the 150 threads on tweaking spi..
They all say the same exact thing. (not sure why they all have not been merged

)
And for pifast.. sure there is a thread on that too... other than that.. its still doing hte same calcualtions of pi... think of it as spi 2M