Because you are planning to remove CSWS, it would be a good idea to make a plugin of it I'm serious, i think it is much simpler to understnd than AWS and it allows a lot of customization through skins. It would be a pity to let it down totally.