Which valve covers clear TF roller rockers keeping the baffle?

I need to get new valve covers - I am getting oil in my intake - if I pull off the air intake tube there is a little puddle of oil at the bottom of the TB. I am using FRPP cast aluminum finned valve covers, but to get them to fit, I needed to remove the baffle and grind down the bosses. Well now it looks that wasn't a great idea. So I need new covers, with a baffle, that clear the Trickflow roller rockers.
I am also running a Systemax intake, so I am going to probably need a 1" spacer - I already needed a 3/8" spacer to clear the ones I have.

Any suggestions are welcomed!