I agree that baseball will likely not stray from the AL/NL alignment. I don't think switching teams is necessary. My alignment is pretty simple, I think. Expand to 32 with the Nashville Stars and Utah Hornets. Relocate the Tampa Bay Rays who become the Carolina Pilots.

American League
Central: Houston Astros, Kansas City Royals, Minnesota Twins, Texas Rangers
East: Baltimore Orioles, Boston Red Sox, Carolina Pilots, New York Yankees
North: Chicago White Sox, Cleveland Guardians, Detroit Tigers, Toronto Blue Jays
West: Las Vegas Athletics, Los Angeles Angels, Seattle Mariners, Utah Hornets

National League
Central: Chicago Cubs, Colorado Rockies, Milwaukee Brewers, St. Louis Cardinals
East: Atlanta Braves, Cincinnati Reds, Miami Marlins, Nashville Stars
North: New York Mets, Philadelphia Phillies, Pittsburgh Pirates, Washington Nationals
West: Arizona Diamondbacks, Los Angeles Dodgers, San Diego Padres, San Francisco Giants

Any geographically-based alignment would be wonky but perhaps something like this (with the same expansion/relocation as above):

Eastern Conference
Atlantic: Boston Red Sox, New York Mets, New York Yankees, Philadelphia Phillies
Mideast: Cincinnati Reds, Cleveland Guardians, Detroit Tigers, Milwaukee Brewers
Northeast: Baltimore Orioles, Pittsburgh Pirates, Toronto Blue Jays, Washington Nationals
Southeast: Atlanta Braves, Carolina Pilots, Miami Marlins, Nashville Stars

Western Conference
Central: Colorado Rockies, Houston Astros, Kansas City Royals, Texas Rangers
Midwest: Chicago Cubs, Chicago White Sox, Minnesota Twins, St. Louis Cardinals
Pacific: Los Angeles Angels, Los Angeles Dodgers, San Francisco Giants, Seattle Mariners
Southwest: Arizona Diamondbacks, Las Vegas Athletics, San Diego Padres, Utah Hornets