Did you happen to have the delivery valve seals replaced before the rough idle started? I had the problem you described and it was due to improper (over) torquing of the delivery valve seals. If so, search the posts under my user name for complete info.

Nick