Oh, I remember you. I wish you wouldn't pass it off that you have a D15B7 all the time. Granted your block code says that, but it's really misleading when we're trying to help you decide on what to do. It totally changes the parts available for your motor.

A Greddy 15G kit would work well.