With Ron Sutton's help, we picked out some brake upgrade parts for Barney and I got them installed this weekend.
We decided to upgrade the front calipers to the larger metric calipers with the 2.75" piston and use some EBC YellowstuffR pads. This should increase my front brake force from 1804 pounds with the R4 pads and stock calipers to 1973 pounds with EBC pads which will hopefully be a bit more street friendly while at the same time work well for autocross. If I want more braking or if the fronts tend to lock up significantly faster than the rears I can upgrade the rear pads down the road.
Best part was, this was all bolt in parts, no modifications or geometry adjustments needed after the upgrade.
Here's the stock D154 caliper with a 2.5" piston
And here's the new Afco Large Metric caliper with a 2.75" piston
They aren't sexy looking, but were bolt ins that didn't require any other modifications and provide a significant increase in braking force.