Strow & Joe, 100%.
This would be perfect. An unstoppable monster tag team. Two guys that don't get along at all, but are still dominant. Strowman is awesome but limited, he's not ready to hold a singles championship, especially not a world championship. Putting him in a tag team with Samoa Joe for awhile keeps him protected, and keeps him relevant in a major storyline. It also gives him an opportuntiy to further develop and learn from Joe.
These two guys could tear through everybdy in the tag team division, before ultimately imploding and facing one another in what I think could be a big time match if handled properly. Storw & Joe, then Strow vs. Joe, could give you months of programming and elevate both guys. This is the best option for his partner at WrestleMania.