I agree about the fast Schottkey. You can also say that the diode must be able to handle 6 amps intermittently, and withstand a reverse voltage of at least 24 volts.
But I want to comment on your "CS" output from the source of the power FET. I assume that stands for "current sense". Since you are driving this circuit with a PWM signal and the solenoid is inductive, the current through the solenoid is going to be a somewhat constant current that rises slightly when the FET is on and falls about the same amount when the FET is off. But it does not fall to zero, because the freewheeling diode allows the current to continue to flow during the time when the FET is off. But your CS output only reflects the current when the FET is on. The CS output fall abruptly to zero when the FET is off. Therefore the CS output is not a very good representation of the current in the solenoid. In fact, if you filter the CS output, it will represent the true solenoid current multiplied by the PWM duty cycle fraction. As the duty cycle changes, the CS output will change, and much more than the average solenoid current changes.
When I had to do something like this, I put my 0.1 Ohm current sense resistor directly in the solenoid connection. That means the voltage signal from the current sense resistor is now differential, instead of single ended and ground referenced. Therefore I had to use a somewhat exotic opamp circuit with very good CMRR and common mode range that included the supply rail. Not easy, but not too hard either. And it does give me the true current through the solenoid all the time - both when the FET is on and when it is off.