Goto made his return to CMLL on March 25 and would, for the next month, work for the promotion as a heel, culminating in a match on April 29 at Arena México's 55th anniversary show, where he unsuccessfully challenged Último Guerrero for the CMLL World Heavyweight Championship in a Two Out of Three Falls match. Goto returned to New Japan on May 3, when he teamed with Tama Tonga to defeat Takashi Sugiura and Makoto Hashi in a tag team match. Later in the event, Goto attacked and declared a war on Hiroshi Tanahashi after he had successfully defended the IWGP Heavyweight Championship against Shinsuke Nakamura. Goto would once again fail in his IWGP Heavyweight Championship challenge on June 18, 2011. After the match, Goto and Tanahashi seemingly made peace with each other, with Tanahashi suggesting that they go for the IWGP Tag Team Championship together. On June 23, Goto, Prince Devitt and Ryusuke Taguchi won their second J Sports Crown Openweight 6 Man Tag Tournament in a row by defeating the team of Giant Bernard, Jyushin Thunder Liger and Karl Anderson in the finals of the three-day-long tournament. On July 3 Goto and Tanahashi failed in their attempt to capture the IWGP Tag Team Championship from Giant Bernard and Karl Anderson. On August 1, Goto entered the 2011 G1 Climax, where he went on to win six out of his nine matches, but a loss to Strong Man on the final day of the tournament dropped him to second place in his block, causing him to narrowly miss the finals of the tournament. In the 2011 G1 Tag League, Goto teamed with Hiroshi Tanahashi as "The Billion Powers". After picking up two wins and two losses in their first four matches in the group stage of the tournament, Goto and Tanahashi defeated the Beast Combination (Satoshi Kojima and Togi Makabe) on November 4 to advance to the semifinals of the tournament. On November 6, Goto and Tanahashi were eliminated from the tournament in the semifinals by Bad Intentions. On November 12 at Power Struggle, Goto unsuccessfully challenged Masato Tanaka for the IWGP Intercontinental Championship. On January 4, 2012, at Wrestle Kingdom VI in Tokyo Dome, Goto reignited his rivalry with Pro Wrestling Noah's Takashi Sugiura, defeating him in a singles match.