I wonder if a bit could be cut/machined off of the bottom to line it up better,

At the bottom of the first post on this page are the measurements of the differences between cap and deck. Even if you chuck in a lathe and remove a bit of the bottom of the cap the holes on the cap will be offset from those on the deck.