Years late I put an inflatable inner tube section into my headrest.
The improvement in comfort was manifest and transformed the ride.
Highly recommend you revisit your headrest. Experiment. Common to have it too far in.
Your other mods are great. What works for you and keeps you riding is all...