I may love Luxray, but I'd never call it a wall by any stretch of the imagination. My recommendation is still Luxray. You can stick with Intimidate (Rivalry ends up doing more harm than good), and if you want, you can make the Luxray a mixed attacker anyway, and its Thunderbolt is quiet usable. The speed issue is most people's primary concern with it, but it learns Thunderwave, so I don't see the problem. Plus, the fact that you can just breed it with Ice Fang really helps against its resistances. Raichu can be used in a variety of ways, though, and I won't deny it's quite useful. If you go with Nasty Plot, it can almost be a sweeper, the only issue becomes being able to set up. You can also go with Volt Tackle, which is a lot of fun, IMHO. All in all, both are good choices, but I'd still stick with Luxray.