How to adjust my existing discount rules to handle some changes correctly..??

Awhile back (when you guys supported me on the phone for free...I loved that!) you helped me put together a series of discount rules to accomplish my goal. I need some help adjusting that now and I'm begging for it here. :)

Our site (beta-sandbox.usbswiper.com) includes a software product that we offer for $39.95 + $4.95/mo. If you purchase additional software licenses they're $15.00 + $1.50/mo extra. I have a rule setup in eCart called "Additional Software Licenses" to handle this and it's working great. It says...

Triggers:
If Quantity of Item 2 >= 2

Calculation:
Flat rate: (($this->GetInfo("2","Price") - 15 ) * ($this->GetInfo("2","Quantity") - 1 ))

Now, we also have bundled software/hardware packages that needed the same sort of discount applied for the software portion of the bundle pack. The bundle packs are separate item ID's, though, so after consulting with WA we wound up with 3 additional discount rules that essentially do the same thing...one for each bundle product ID....

Triggers:
If Quantity of Item X > 1

Calculation:
Flat rate: 24.95 * ($this->GetInfo("X","Quantity") - 1)

This correctly handles our bundle packages and we've been happy with it, but I just noticed recently that I've got a problem at this point when somebody adds a bundle package AND a single software license on its own. The single software is getting added at the full $39.95 + $4.95 when it should be added at $15.00 + $1.50 because they're already paying the full license price in their bundled product.

I do have a CategoryID available within eCart. All of my bundle items are included in CategoryID 7 and my regular software item is CategoryID 2.

So, I think I have everything I need to adjust these discount rules, but I get lost when I get into these things for some reason and WA has always been a great help. Any information on adjusting this would be greatly appreciated. Thanks!!