well intel processor are currently better than amd in the high end range, even the bulldozer still can't compete with the i7-2600k, however, for your video editing needs, the fx-8150 might offer a better performance in multi-threaded applications, since you listed heavy gaming the last, i assume your video editing needs are more important. then go with fx-8150
Oh, Thought you were buying the whole thing. Well then the only thing that's really going to make an improvement in performance probably would be more cores in your CPU for Video Editing depending on exactly what you do and more memory would probably be a good idea. If you move to Bulldozer to get the additional cores that requires a new MOBO as well. Could cost over $400 goin that way. Personally, I'd upgrade the memory to an 8GB kit (2X4GB) and then maybe get a Phenom II X6 1100T and then overclock the CPU to 4Ghz or higher. That would be pretty close to getting an FX-8150+motherboard in performance and end up costing a lot less money.
Waiting for Ivy Bridge is probably a great idea, considering how powerful they just might be when released. There's nothing worse than just upgrading your build only to see new tech hit the market days/weeks later.