Just about, yes. I kept the VGs in the same place, since earlier tuft testing proved they worked in that position, but I increased the angle on the outer VGs and added the spoiler like you suggested. It's about 3.5" long, extending 1.5" past the stock lip:
