Did you derestrict the pipe? Is anything else causing drag? Is it variating all the way?
That setup should be going a solid 40+
You're definitely working your way into this the right way, I wouldn't say not to get a pipe but you might want to tune it a bit more and see if you're leaving something on the table.