Doesn't help your current situation, but Lyft allows you to link both a business and personal CC, and tip/ride are charged together. No problems yet with % tip either