A Hotrods or Driveline 4mil crank, Serval cylinders, Wiesco pistons, Chariot billet clutch basket, Driveline hd clutch and promod trans will be a solid setup. Porting the serval will make a bigger difference but you can always add that later. The 421 Serval will already be a huge improvement over your current setup. Big bore engines (421 serval included) require a different dome than the small bore you have which is why the discrepancy between 21 and 23-24.
If it were mine I would ditch the stock carbs and boost bottle as well. 28-35mm PWK on the carbs depending on the type of riding.