Go for the SOL-D. Mine is getting the summer work out now. My old fsd would give code 35 also. Have it as a back up though I'm sure I won't be using it any time soon.
Got a code 36 the other day running on low fuel and it was hot. Has not returned. IP is into the 90k mark.