The 6401 is just the older version of the 6421, and is a great candidate for the 79cc upgrade.
If you get the older PS-7900/DCS7901 top end you can use the existing top covers, and the decomp. I will say, though, never a bad idea to replace the decomp when doing this.
If you get the newer top...