I would figure both may be appropriate with #2 considered as "more rigorous analysis". But what will be your allowable stress for #2? Do you intend to use the criteria in ASME VIII-2?
I believe #1 should be fine but what do you mean by "modified" f? Is this the cycle adjustment for combining two or more cycle sets? (different cycles for T and cycles for D) If so, you would first have to run EXP for T and then EXP for D to find the controlling value and then determine the equivalent cycles to set the allowable for the higher calculated stress. - This can get complicated real fast.
If you can pass the total EXP (T+D) using the largest cycle set (D?), perhaps you can justify safe operation.
_________________________
Dave Diehl