How exactly did you arrive at that particular plenum size and runner length?
If you bellmouth the runners inside the plenum, that should help a good bit keeping flow smooth into the runners, resulting in power improvements across the board.
See if you can find a pic of the M5 intake manifold w/ the cover off (the outgoing V8, not the new V10, i've not seen its manifold details)