Welcome to the forum - 20 combined isn't bad. And you're right that a partial grille block (or variable block via shutters if you're up to engineering something like that) will help.
The big aero gains are to be found on the bed though. Search around - there are a number of excellent threads on DIY construction of an "aero shell" or "aero topper".
Have a look at this chart as well..