if possible, check your drive health also specs (read/write speed), cause if not “good enough”, swap I/O may be affected and may not give the expected performance
you also don’t need to re-partition your disks, still a good idea to do so if you can confirm that swap helps performances and to have a clean install