I'd like to suggest to enhance SQL Trace informations by adding information about the current plan line to each row (where it makes sense, of course).
By this feature waits could be grouped by plan line - or in best case the trace can be transformed in something similar to a sql_monitor_report.