Congrats on the 3k, I have always been fond of the 3000. I know you will enjoy it.
I don't think the 4000 version of the warp engine fits in a 3k desktop. You will need the 3k version for that.
I would recommend the warp engine over the cyberstorm for a 040. I have had both over the years, and it worked better for me.
Good luck!