816's work great. The plastic gearbox may require just a little trimming off at the back of the box, unless you just cut the 3R pilot loop off the trucks for clearance. Otherwise, IMO, you'll enjoy a much better experience than if you went with the 806 short shank.
If you think you might go with the new E style couplers for more of your equipment, consider experimenting with the 745 couplers as they are exactly the same as the 816's (medium centershank metal coupler/plastic geabox) but with the new e head on them. Just keep in mind they may require a little more work when uncoupling if you're using a pick type of tool.
