Just one thing - the radial spoking on the front with what looks like 32 spokes and a small flange, run on a rigid fork, looks like it could be problematic. Have you checked that the hub is approved for that lacing? I only ask because I had a very similar set up and it caused me a cracked flange - and that's no fun.
If you can be bothered I would recommend relacing the front wheel. It'll be more comfortable too. I'm surprised you cracked the face plate on an x4. I've done it with an x2 - you have me worried now... I have x4s on three bikes.