It would be helpful if you mentioned what about the Swift proved unsatisfactory and what steps you already tried to improve the situation.
Was it how racks were mounted?
Was it just comfort? --> What tires did you try? Perhaps the thudbuster attachment would be a cheaper alternative than a new bike.
I recall that if you got a custom Swift from Peter Reich or Jan VanderTuin that he would braze on rack mounts and the such. So if you liked everything about the bike except that -- or the frame meterial -- perhaps that would be your answer.
Alternatively, a BF Llama might fit you better -- and consequently be more comfortable. It can fit wide tires and be purchsed with a front suspension (Pocket Gnu).