Have you checked out the offerings from Kirkby Microwave Limited in the UK? David Kirkby is a member of this group and would be my go-to guy for this, he sure knows his stuff on VNA calibration!
I should imagine he'll be along on this thread shortly anyway........