I would think that before an upgrade to 2.2 you would want to remove the lagfix. I think it would cause issues due to the way it works. I may be wrong, but that is my thought. I wouldn't worry about the GPS fix. Worst case scenario, the update will overwrite it anyway.